WIP created haversine logic
deleted Rails default README and added a custom one
Merge branch 'master' of https://github.com/mule-deer-2013/greenlight
Merge pull request #6 from mule-deer-2013/vote_feature

Vote feature
add haversine calculator
add location
solved merge conflict
sign up fires a properly structured ajax call
solve merge conflicts
fixed merge conflicts to reflect current_user and login state
deleted gem from gemfile and fixed merge conflicts in users_controller
Fixes merge conflict in user model and votes controller