Creating template
Merge branch 'master' of github.com:vincentdyleung/9dash-server

Conflicts:
	README.md
	package.json