Add deck box item
Formatting changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/io/github/andrewbgm/openccg/reference/Names.java
Fix refactor derp