Initial commit
Merge branch 'develop'
- Merge branch 'master' of github.com:jlaso/my-simple-web

Conflicts:
	README.md
Merge branch 'master' into develop