new style classes!
Merge branch 'master' of https://github.com/DiscoBizzle/Ghost-Simulator
Merge branch 'master' of https://github.com/DiscoBizzle/Ghost-Simulator
Skill system beginnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	gslib/constants.py
Skill system stuff
Skill system stuff
Merge remote-tracking branch 'origin/master'