Merge pull request #4 from abcm1989/master

changes to migrations and models