less whitespace
Merge branch 'master' of https://github.com/tonocm/hackerchat

Conflicts:
	views/profile.jade