setup, changes to assets model
user sign in login and logout with bcrypt
quick fix to routes
fixes checkin form to add to database
resolved conflicts
user account page and cross-site navbar
rmagick setup, image scaling
Updated Seedfile
updated checkin model
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
added testing gems
updated gemfile, deleted test unit, and rspec:install
adds leaflet map to checkin_form.js.coffee, optional mobile css, and custom marker example
removed extraneous image
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development_a
Merge branch 'development' into feature_leaflet_checkin
Merge branch 'development_a' into feature_leaflet_checkin
added specs
Finished seed file, corrected category_spec, and added location method to checkin model
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development