BugGame refactoring and some tests
Merge branch 'master' into kenji_jasmine

merged!
Merge pull request #98 from red-admirals-2014/kenji_jasmine

Kenji jasmine