fixed more upgrade stuff
fixed more upgrade stuff
Merge branch 'master' of github.com:jacobwagner/monster

Conflicts:
	monster/upgrades/four_two_one.py
pep8
Merge pull request #32 from jacobwagner/master

fixed more upgrade stuff