name change of project
recover app.js
Rename of project
Merge branch 'master' of https://github.com/rweigel/tsdset

Conflicts:
	package.json