Combat in the proper place.

Closes #2
Merge branch 'master' of https://github.com/felesmortis/QSQ

Conflicts:
	Globals.py
	QSO.py
Merge branch 'master' of https://github.com/felesmortis/QSQ

Conflicts:
	QSO.py