project reborn
Merge branch 'reborn'

Conflicts:
	package.json
remove unused files