Tweaks and a start to a fight fix
Merge branch 'master' of https://github.com/whiterson/mockingJay

Conflicts:
	tribute.py