property name changes
Merge branch 'working_db' of https://github.com/tylerkern/pro260_team4 into working_db