starting on assignment page
Merge branch 'master' into working

Conflicts:
	client/app/assignment/assignment.jade