fixed test
Merge branch 'master' into deployment
fixed gem lock
Fixed seeds file
Merge pull request #5 from ieatkimchi/seeds

Fixed seeds file
Fixed seeds file
Merge pull request #6 from ieatkimchi/seeds

Fixed seeds file
Update README.md
adds initial google map to main user page
fixed conflict in development.log
Merge pull request #7 from ieatkimchi/Prelim_Map

Prelim map
Add markers for event locations
Merge pull request #8 from ieatkimchi/event_data_check

Add markers for event locations
rendered user nav partial, redirects signed in users to the app at root
split name into firstname/lastname for user migration, added text to event migration
indexed foreign keys on events table
commiting development log

need to commit log to avoid merge conflict with
master
fixing merger conflict
development log
css testing