Commit 6
Merge branch 'master' of https://github.com/afay2017/BasicGames

Conflicts: