Updates
Merge branch 'master' of https://github.com/Daeik/Anima

Conflicts:
	index.php