fixing merge
deploying to heroku
removed xw from line 215 of application.css
Update README.md

Hoping to force a clean build on codeship.
log file again
some stylings
Merge pull request #82 from s-loar/Lienha

some stylings
getting ready to pull updates
pull merge
.
Merge pull request #83 from s-loar/addingAJAX

Adding ajax
bike icon smaller
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into tweeks
Merge pull request #84 from s-loar/tweeks

Tweeks
Delete .DS_Store
adding the votes to recommendation
closing bike info windows
Merge pull request #85 from s-loar/close_bike_infos

closing bike info windows
added voting functionality to recommendations
Delete .DS_Store