Fixing sync thing in app

I had inadvertant staged commits to get rid of so i'm commit an exact
copy of whats here
Merge branch 'master' of https://github.com/theKristi/GameDev_spring14