commit2
commit3
Merge branch 'master' of https://github.com/piotrdz/sem_med

Conflicts:
	zarys.txt