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

Conflicts:
	manga/5.html
	manga/6.html
Merge branch 'master' of https://github.com/cattybatty1997/animaniacs