Missed a merge conflict
made eddies code cleaner
Finished integrating authentication with old tests
fixed duplication of crop
cleaned javascipt button for geolocating
fixed rspec, gitignore updated, simplified index
Fixed uploader coverage
Quick commit for features
Another routine commit
Cucumber for free crop works...pressing radio buttons doesn't