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

Conflicts:
	index.html
Mreged.