test change
URLs update!!

Merge https://github.com/ashmonger/scat2web

Conflicts:
	scat2/templates/scat2/about.html