Steph tuesday

this merge contains changes to the db. run rake db:migrate, plzz!