commit for rikitier
Merge branch 'master' of https://github.com/JoschkaSchulz/psychicGame