added migration tables and models
fixed gemfile lock conflict
added seeded database
fixed db to have our gravatars
Merge pull request #3 from Gunga/danny

Danny
Merge pull request #4 from Gunga/styling

ADD USER LOGIN AND SIGN UP
FIX MERGE VARIABLE DIFFERENCES

We had defined username as user_name as it had been agreed upon. However, the actual column was renamed to username. This commit fixes that change. It also adds a logout.