hummerfest
Merge branch 'master' of https://github.com/jerka/team1

Conflicts:
	server/app.js