lots of changes
Merge branch 'master' of ssh://github.com/DontWorry33/CircleGame