resolves merge conflicts
fixes time zone format in seed data
added current_user helper to application_controller
added checkins_controller - creates checkins
rm locationController.js
Merge pull request #7 from nickmeehan/location-logic

Location logic