still working
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
still broke
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
stuff has begun to work, YAY
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
More location things
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
All the location things
Thumbnail working finally
Merge conflicts
Add things to help serialize
Add a 'search nearby' method
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch
bullshit location fuck
Beautiful shit
location kinda works?
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch
Location is now properly deserialized from ES.