My new edit

to the file
Merge branch 'casey' of https://github.com/alpha1337/Avalon into casey

Conflicts:
	another-new-file.html