Trace removing
Trace removing
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
	routes/api.js