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

Conflicts:
	application/views/welcome_message.php
Hi
dev
dev
dev
dd
ok
tt
J'ai commit lol
yy
r
lol
test git
Merge remote-tracking branch 'origin' into dev
lol