Merge pull request #1 from Zaiban/master

Backmerge
a lot of addittions
game working to some degree
Merge pull request #2 from Zaiban/develop

Develop