.
Merge branch 'master' of github.com:ogny/orkungunay.com
m

Conflicts:
	source/_includes/custom/navigation.html