First commit for dev
Merge branch 'master' of https://github.com/caledary11/dev