Update to upstream
Something
Merge branch 'master' of github.com:PennAppsFellows/ProjectPHL
Checkpoint
Added Location
Removed Underscore and Added Maps
Merge pull request #18 from guozhaonan/master

Added in Location and an interesting if condition for view home page