updated license
Merge branch 'master' of github.com:ohler55/oj