reran rake db:migrate
Merge branch 'master' of github.com:vanblaze/testapp