jb
Merge branch 'master' of https://github.com/bvonhalle/bvonhalle.github.io

Conflicts:
	index.html