added devise, user MVC
login/sign up routes working
devise gem
setting up branch
filetree change
sorting out merge and filetree problems
looking good
devise and associations running
added testing
added fields to events
Merge pull request #3 from ieatkimchi/devise

Devise
adjusted view/index for event test
Add seed data
Merge pull request #4 from ieatkimchi/seeds

Add seed data
fixed merge conflicts
Merge branch 'master' into deployment