uncommenting map
added back divs route/directions
fixed new_user_spec to reflect changes to main page
created station model with station controller in order to pull citibake data from ajax request
added citibike stations to map
add citibike icon to marker
removed station index
create shop model
add shop controller and create index
create shop#index route
added bike shops to map
ran a bundle exec rake spec to fix travis
remove ability to drag markers wherever user desires
travis test
update README so that travis point to develop branch