Creating template
initial dev env setup
Merge branch 'master' into unlimitedfocus

Conflicts:
	README.md
	package.json
	server.js
tmp