Trying to update
Merge branch 'master' of github.com:brittmedles/flipbookV2