Merge branch 'master' into dev_website
Refactoring Front Folders
Basic routing Server.js Client.js

Route set up for loading assets and libs
Basic Plan setup

Commit just to show the content of the db.json
Merge branch 'dev_website'

Conflicts:
	back/controller/Server.js