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
Add images to the homepage
Try and commit without the show and schema files (?)
Pony sending emails on workshop submit (but not w/ reply-to email)
Pony proposal submitted emails
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp
Include reply-to email and link to workshop in Pony
PONY and a few other fixes

fixed update user page (settings), created PONY emails, fixed inability
to sign out
Fix merge conflicts with PONY
commit db/schema.rb because it's telling me to
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp
commit db/schema.rb because it's telling me to, again
merge Homepage-illustrations into master
spellchecked logo w/ drop-shadow
Added BCC to PONY deliver methods
Signup fixes - removed datepicker etc

also fixed password encryption and syntax on signup