changes
Merge branch 'master' of https://github.com/robgalliani/FlipTurn
fixed some stuff up