commit
Merge branch 'master' of https://github.com/shaeallison/491app

Conflicts:
	profile.html