initial project version
Merge branch 'master' of github.com:dannyng84/dev