after successful 'rake db:migrate'
Merge branch 'master' of github.com:Yorkshireman/pinteresting

I've no idea why I had to do this merge, but git said I have to before I can 'git push'. I had done a hard reset to a previous commit and then done a 'rake db:drop', 'rake db:create', then 'rake db:migrate', which was finally successful (I'd been getting an error when trying to migrate).