kat new add
Merge branch 'dev'

Conflicts:
	katerina.txt