working game merged into master branch