add
delete unuseful
Merge branch 'master' of https://github.com/Andos25/falcon

Conflicts:
	webserver/routes/index.js
change