fixed my own error in AP + VolCalc added
Merge branch 'master' of https://github.com/MylesBragg/jsu-mcis-cs310-Group2Scrum

Conflicts:
	main.bat
AP-added clause for type + added Controller/VolCalc