check conflict.html
khkj

jkbjbjkk
last

last
Merge branch 'master' of https://github.com/phizaz/IcyKankwin

Conflicts:
	index.html
Merge branch 'master' of https://github.com/phizaz/IcyKankwin