Added simple game class
Merge origin/master