merge
Merge branch 'master' of https://github.com/fmy/kinokore

Conflicts:
	main.js