X
Merge branch 'master' of https://github.com/fdurajka/franto.sk

Conflicts:
	_layouts/default.html