Creating template
Merge remote-tracking branch 'rhcloud/master'

Conflicts:
	README.md
	package.json
Update index.html