fixed buggy frames, added first encounter image
Merge branch 'master' of github.com:bitterfly/6a
fixed composite blend
more stuff
moooooar stuff
Merge branch 'master' of github.com:bitterfly/6a

Conflicts:
	encounter_images/01/bg.png
Merge branch 'master' of github.com:bitterfly/6a
Merge branch 'master' of github.com:bitterfly/6a
Merge branch 'master' of github.com:bitterfly/6a
choices work
Merge branch 'master' of github.com:bitterfly/6a