nothing
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct
ça fesait longtemps
Conflicts:
	persistance/Personnage_BD.js
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct
test
maj
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	app.js
	model/database.js
	persistance/Case_BD.js
	persistance/Item_BD.js
	view/canvas_uptodate.js
maj
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	app.js
	persistance/Item_BD.js