shit!!!
Merge branch 'master' of https://github.com/mrVeles/mybookshelf

Conflicts:
	.gitignore