repositioned player, image changes
conflict resolve
more styling changes, default player image
Merge pull request #18 from paulhyunkim/stylebranch

modal sign-up
gitignored ds_store
Merge pull request #19 from paulhyunkim/tsangbranch

DS-store changes, resolved conflicts
changed json endpoints, working on updating user location
ready to merge
Merge branch 'master' into stylebranch