mhiatt COLORS
Updating comments. Authors: mhiatt nmcmahon1215
Merge branch 'team3Master' into feature-refactor-edittab

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/views/TaskInfoView.java