Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

Conflicts:
	KingNThings/src/com/util/Util.java
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings