server running jade
no message
angular
Merge branch 'master' into tinder

Conflicts:
	server/main.js
Merge remote-tracking branch 'origin/master' into tinder