init git
update
Merge branch 'master' of https://github.com/Cangol/Cangol-uiframe