TestNG update
Merge branch 'master' of https://github.com/atscott/ScrumRobot.git

Conflicts:
	srcTest/edu/msoe/se2800/h4/jplot/JPlotControllerTest.java
Merge branch 'master' of https://github.com/atscott/ScrumRobot.git

Conflicts:
	src/edu/msoe/se2800/h4/AdministrationFeatures/DatabaseConnection.java
	src/edu/msoe/se2800/h4/AdministrationFeatures/LoginUI.java
	srcTest/edu/msoe/se2800/h4/AdministrationFeatures/DatabaseConnectionTest.java