merged ethan's dev into origin
fixed merge conflicts with peter's most recent changes
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev