test
Merge branch 'master' of https://github.com/johnkrovitch/streetart

Conflicts:
	maquettes/site_old/web/index.php