test
Merge branch 'master' of https://github.com/mtntjke/try_git

Conflicts:
	content/text.txt.txt
test