Merge branch 'master' of https://github.com/picobyte/baconjam5

Conflicts:
	states.py