Sign Up-> Register
Merge branch 'master' of https://github.com/TheyShouldHaveATeam/TheyShouldHaveThis

Conflicts:
	public/js/menubar.js