My Website
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/bjoachim/bjoachim.github.io