[master]  stuff w/ isaac
Merge branch 'master' of https://github.com/isaacd9/gipsydanger

Conflicts:
	Symfony/web/config.php