first commit in dev
Merge branch 'master' of github.com:triump0870/home
Updated