Merge branch 'master' of https://github.com/hurricanerix/gotbattles

Conflicts:
	gotbattles/__init__.py
Merge branch 'master' of https://github.com/hurricanerix/gotbattles

Conflicts:
	gotbattles/__init__.py