Removed test if __name__  stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	shadowrun5/character.py
	shadowrun5/rules.py
Fixed spelling mistage in code