- did some stuff
Merge branch 'master' of https://github.com/EwaKowalczuk/annot

Conflicts:
	css/annot.css