rename some file
Merge branch 'master' of https://github.com/kerrongordon/tamcc

Conflicts:
	style.css