Merge pull request #15 from jrahm/master

stuff
Added getters and setters
more stuff + game state