some style changes
Merge branches 'master' and 'master' of https://github.com/Fathalian/Guild

Conflicts:
	app/views/signup.html