fix history
Merge branch 'master' of github.com:cheredon/universiade