changes made on presentation day
Merge branch 'master' of https://github.com/danw13335/lannister-final-project-website

Conflicts:
	submit_profile.php
not sure what's going on