new updates10-15
Merge branch 'master' of https://github.com/MylesBragg/jsu-mcis-cs310-Group2Scrum

Conflicts:
	src/main/java/edu/jsu/mcis/Controller.java