work
Merge branch 'master' of https://github.com/kshu1989/manga

Conflicts:
	.gitignore