Sharing subsample amount
autoformat
Merge branch 'master' of github.com:havocx42/ozawa

Conflicts:
	HexTCGDeckBuilder/src/com/ozawa/hextcgdeckbuilder/hexentities/Card.java