Encounter 1
Merge branch 'master' of github.com:bitterfly/6a