Merge branch 'master' of https://github.com/ricearcane/ti_contest