nan
Merge branch 'master' of https://github.com/Herzucco/kawaiusagi

Conflicts:
	TestTypeScript/src/player/Player.ts
Merge branch 'master' of https://github.com/Herzucco/kawaiusagi