merge develop to master
Merge branch 'master' of https://github.com/reimersjan/resblogsive

Conflicts:
	README.md