first commit
Merge branch 'master' of https://github.com/vladiki/cs188-contest

necessary first merge