fixed all animations
Merge branch 'master' of github.com:bitterfly/6a

Conflicts:
	web/img/encounters/lbl2.png