adds UserName &&&timestamps to normal comments
Merge branch 'dev' into feature/gui2
added timestamps and user names to merge
Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/presenter/TaskPresenter.java