Testing the heroku buildpack option
Merge branch 'code-build'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json