shares
Merge branch 'master' of github.com:askmedia/CitizenData-Nantes-Sport

Conflicts:
	index.php
	js/nantes.js