coffeelint added
merge
Merge branch 'master' of github.com:rooc/gruntweb

Conflicts:
	package.json
	source/index.jade