cleanup
Merge branch 'master' of https://github.com/pestrov/SkolWeng

Conflicts:
	pres.key/Data/1-001_M_1611x1432-small-7.png