first commit
First commit and merge

Merge branch 'master' of https://github.com/cruz-woods/test-site