Creating template
Merge commit '49f1a4c3c7d7b199b915cb5594c0d9a95cc5bc27'

Conflicts:
	README.md
	index.html
	package.json
	server.js