weekly
weekly
fixing merge conflict
Merge branch 'master' of github.com:ksimek/ici-seminar

Conflicts:
	atom.xml
	index.html
	page2/index.html
	page3/index.html
	page4/index.html
	page5/index.html
weekly