Merge branch 'master' of https://github.com/osuHackathon/hackathon

Conflicts:
	test.php