new grunt task: image resize, makes thumbnails
Merge branch 'master' of github.com:Kageetai/maJekyll

Conflicts:
	package.json