initlocal
Merge branch 'master' of github.com:halaei/presenter

Conflicts:
	README.md