cleaned up code
merge

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