Course des 2 côtés
Merge branch 'master' of https://github.com/ITKWeb/BattleTower

Conflicts:
	public/javascripts/item.js