third submit right after mike

This is going to be my third submit right after mike did
Merge branch 'master' of https://github.com/scittadini/citytest

Conflicts:
	README.md
	buildthisshit.php