renamed a file and linked the renamed file
Merge branch 'master' of https://github.com/titse/final-project

Conflicts:
	template-characters.html

BLAH.. im behind by 8 commits!