From January to May, lawmakers battled about the best ways to fund public schools and provide raises for teachers. Lawmakers are expected to return to Austin this fall to discuss proposals that did not pass during the regular session.