Merge branch 'master' of https://github.com/Gabe-Issa/CollabRater

Conflicts:
	profile.html