Creating template
Merge branch 'master' of github.com:jenglert/ptt-node

Conflicts:
	README.md
	package.json