updated file naming conventions
Merge tag 'version_1.0' of github.com:the-hobbes/softwareEngineeringFinalProject into dev

This is the release ready version for the application
Merge branch 'master' of github.com:the-hobbes/softwareEngineeringFinalProject into dev
merged in phelans name changes for files