before we merge this, could you please do a rake db:migrate so you will pick up the new columns i added?
otherwise i think your commit will remove the db additions I made in last merge