Changed some stuff
Merge branch 'master' of https://github.com/technoman316/FinalProject.git
Merge branch 'master' of https://github.com/technoman316/FinalProject.git
Merge branch 'master' of https://github.com/technoman316/FinalProject.git
Merge branch 'master' of https://github.com/technoman316/FinalProject.git
Changed the item names