some changes
Merge branch 'master' of https://github.com/dude-seriously/gimme-that-ball