Merge branch 'master' of github.com:red-bird/competition-program