there is no change, but git still thinks there is, probably just a new line somewhere
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project
Merge branch 'master' of https://github.com/CMPUT301W14T07/Team7Project
Wrote some additional tests some still fail:

LocationModel Test
- testGetLocation

PreferenceModel Test
- testPreferenceSerialize

UserModel Test
Deleted the testUserLocation as it is tested in Location Model Test