Refactored Items to meet naming convention.
Merge branch 'master' of
https://github.com/CodeFusionOne/CSCI3130_Project.git