komin
Merge branch 'master' of https://github.com/fancystudio/kominy

Conflicts:
	index.php