Cleaning up -_-
Merge branch 'master' of github.com:Objective-by-CMDS/Objective

Conflicts:
	app/views/taskboard.ejs