Trimming block is back
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings
misc
best yet
merge
cleanup
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

Conflicts:
	KingNThings/src/com/presenter/BoardPresenter.java
cleanup
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

Conflicts:
	KingNThings/.classpath
cleaned up code