Finished IKON2 - 12
Merge branch 'master' of github.com:opatut/uni

Conflicts:
	ikon2/index.pdf