Changed stuff
Merge branch 'master' of github.com:conchulio/kindle-to-readmill

Conflicts:
	views/index.haml