added stuff
Merge branch 'moretesting' of https://github.com/OITCST326/JuniorProject.git