Progressive Image, htacces, index boilerplate
Merge branch 'master' of https://github.com/willianjusten/base-grunt-compass

Conflicts:
	index.html