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

Conflicts:
	site/classes/StreetArt.php
	site/views/homepage.html.twig
	site/views/layout.html.twig