switching to another computer
did some stuff

switching computers because jill's sucks
should be everything for working member stuff
Member Integration
Merge remote-tracking branch 'origin/devel_member' into devel

Conflicts:

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/sidebar/SidebarView.java

TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/taskmanager/vie
w/sidebar/TaskEditView.java