doing what peter is asking me
Merge branch 'master' of github.com:Lemonice/AngryCarl