do
do
Merge branch 'master' of github.com:bogdan/blog

Conflicts:
	main.otl
do