Added username to comments
Merge branch 'master' of github.com:freakinrican1/SkittleMonkies_TaskManager

Conflicts:
	app/assets/stylesheets/global.css