Night starting
Merge branch 'master' of https://github.com/ElliotSwart/wmhhackathon

Conflicts:
	src/app/give/do/do.js
	src/app/give/do/do.tpl.html