Merge branch 'master' of https://github.com/dominikkrejcik/deadlines

Conflicts:
	server/public/index.html
Conflict