add slide of koron
Merge branch 'koron-slide' into gh-pages

Conflicts:
	2014/timetable.mkd