added basic game play test
Merge remote-tracking branch 'origin/master'