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

Conflicts:
	states.py
Merge branch 'master' of github.com:picobyte/baconjam5
Merge branch 'master' of github.com:picobyte/baconjam5
Merge branch 'master' of github.com:picobyte/baconjam5