Lol
Merge branch 'master' of https://github.com/Kyuran/aniManga

Conflicts:
	application/views/welcome_message.php
Hi