Creating template
fixing conflicts
fix package.json
update package.json
Merge branch 'master' of github.com:raiseandfall/team-data-capture

* 'master' of github.com:raiseandfall/team-data-capture:
  Changed paths in gitignore