some-init
some-init
Merge remote-tracking branch 'origin/game-mech-0.1'

Conflicts:
	.gitignore
Merge branch 'game-mech-0.1'
Merge remote-tracking branch 'origin/game-mech-0.1'
Merge remote-tracking branch 'origin/game-mech-0.1'
Merge remote-tracking branch 'origin/game-mech-0.1'
Put up a jar, updated the readme
minor adjustments
minor adjustments