need to rename migrations to run them
merge
Merge branch 'master' of github.com:cs45977/localizeit