dummy king
merge master
Merge branch 'master' of https://github.com/kurtle/molyjam2013

Conflicts:
	Knave/src/Registry.as