added Ashton Button
Merge branch 'buttonTest' of github.com:dcpounds/wpi-suite into buttonTest

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/TaskManager/TaskManager.java
Merge branch 'buttonTest' of github.com:dcpounds/wpi-suite into buttonTest

Conflicts:
	TaskManager/src/main/java/edu/wpi/cs/wpisuitetng/modules/TaskManager/TaskManager.java
Merge branch 'buttonTest' of github.com:dcpounds/wpi-suite into buttonTest

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