Ignoring the images directory for faster installs
Merge branch 'master' of https://github.com/TehShrike/k

Conflicts:
	package.json