edited
Merge branch 'master' of github.com:cattybatty1997/animaniacs

Conflicts:
	anime/1.html
	anime/2.html
	anime/3.html