loc commit
Merge branch 'master' of https://github.com/Fathalian/Guild

Conflicts:
	app/views/signup.html