try and add files without db/schema.rb
resolve conflicts with user helper fields and show
commit the schema db file caus it's preventing a merge
commit the db schema file on the master cause its bein SUCH A BITCH
fix the whitespace difference in schema db file
Try and commit without the show and schema files (?)
Pony proposal submitted emails
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp
PONY and a few other fixes

fixed update user page (settings), created PONY emails, fixed inability
to sign out
Fix merge conflicts with PONY