Initial commit
Update README.md
Merge remote-tracking branch 'hub/master' into base-template