things were changed
Merge branch 'working' of https://github.com/Akollek/WorkTogethr into working

Conflicts:
	client/app/assignment/assignment.jade
	package.json