Search results update
Merge branch 'master' of https://github.com/schoolmatch/school_match

Conflicts:
	app/views/students/_form.html.haml