Creating template
Merge branch 'master' of ssh://bitsweb-whopper.rhcloud.com/~/git/bitsweb

Conflicts:
	README.md
	index.html
	package.json
	server.js
Merge branch 'master' of https://github.com/bitsystems/bitsweb