Grunt sprite command fixed
Merge branch 'master' of https://github.com/kentcc/kelsi

Conflicts:
	assets/css/style.css
	assets/js/main.js
Merge branch 'master' of https://github.com/kentcc/kelsi