updates to not break cinnmaons
Merge branch 'master' of github.com:gibiansky/adventurer

Conflicts:
	episodes/one.adv