Merge pull request #17 from paulhyunkim/tsangbranch

Fixed merge issues
removed geocoder gem
repositioned player, image changes