Conflicts:
	README.md
	lib/assets.js
	package.json
	src/assets.coffee
	test/DevelopmentIntegration.coffee
	test/ProductionIntegration.coffee
	test/assets/css/style.styl
	test/builtAssets/img/foobar-25c2e8559281a2cd7503300442862885.png