#13, conflicts fixed
Merge branch 'master' of github.com:elpassion/vielen_games