fixed bug
Merge
branch 'master' of https://github.com/elanas/TheCrazySix