Fixed migrations
Merge branch 'master' of https://github.com/thedevguy/shufffle-web