Fixed merge conflict with geocoder in Gemfile.lock
Merge branch 'user_login_tests'
Initial Event integration test
Merge pull request #13 from JustAboutJeff/create_event_test

Create event test