Merge branch 'master' of https://github.com/jhabr/JHSlideShowView

Conflicts:
	README.md
Merge branch 'master' of https://github.com/jhabr/JHSlideShowView
+ readme updated