Pulled latest changes
Merge branch 'master' of https://github.com/pxlfox/kri

Conflicts:
	style.css