license link edit
Merge branch 'master' of https://github.com/acatinello/wiki