Updated Django's State

On his way back to Django’s ranch, a GIANT chipmunk (apparently named Godzilla) appeared from over the nearby mountain. Much to Django’s dismay, the cattle scattered, alerting the local sheriff who arrested Django on the spot.
Merge branch 'Django1stState'
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01