pushing files
Merge branch 'master' of github.com:lthomas93/Mmaroster

Conflicts:
	html/studentquery.php