commita
Merge branch 'master' of https://github.com/tituszban/FantasyGameBS

Conflicts:
	FantasyGameBS/GameController.m
	FantasyGameBS/Spell.h
commitbb
Merge branch 'master' of https://github.com/tituszban/FantasyGameBS