Initial commit
cleanup
Merge branch 'master' of https://github.com/ACParadox/Estimateur

Conflicts:
	.gitignore
	package.json