first commit
Add files to git
Merge branch 'master' of https://github.com/jeffrobdun/dev