Removing old files
Merge complete

Conflicts:
	scorecat/www/index2.html