First Jekyll try
Merge branch 'master' of github.com:pzurek/pzurek.github.io

Conflicts:
	index.html