Combat now with new and improved crits
Merge branch 'master' of https://github.com/felesmortis/QSQ

Conflicts:
	Character.py