fix some production errors
commented but easier to reverse
Resolve a merge conflict
Merge branch 'master' of github.com:balloonchallenge/balloonchallenge.org
finished tracker page