did 6)
Merge branch 'master' of github.com:balloonchallenge/balloonchallenge.org