stufffffff
Merge branch 'master' of https://github.com/DongyKong/CS-351-NOM-NOM

Conflicts:
	php/database.php
fixed?