Merge branch 'master' of https://github.com/douwevdijk/rogermore

Conflicts:
	index.html