Merge pull request #14 from uipo/master

Moving tests
Tests in game
Merge remote-tracking branch 'upstream/master'