Merge pull request #14 from dcombslinkedin/master

updated ember-cli-shims version because the 1.1 version was loading a…

Author: stefanpenner

package.json

@@ -32,7 +32,7 @@
     "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.7.0",
     "ember-cli-qunit": "^4.0.2",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^2.2.0",
     "ember-load-initializers": "^1.0.0",