not getting an error in the rake db migrate
Merge branch 'master' of https://github.com/katieensign/hack_tx