-
Merge branch 'master' of https://github.com/wonderix/shiftbay

Conflicts:
	views/assignment.slim