Reformatted stuff and started solving some of the individual problems.
Merge branch 'master' of https://github.com/aaronweiss74/hackromancy

Conflicts:
	src/main/java/two/hackromancy/core/ActiveSpell.java