Formatting the classes
Merge branch 'master' of https://github.com/minutheresathomas/cmpe273-Project

Conflicts: