Isue #312
Issue #312 package.json
package.JSON
Merge branch 'master' of https://github.com/mozillafordevelopment/webmaker-app

Conflicts:
	gulp/less.js
	package.json
Package.Json and Less.js repushing
Merge pull request #366 from hzahoori/master

Issue #312