Merge branch 'angular-app'

Conflicts:
	app/assets/stylesheets/layouts/_global.scss
	app/views/home/main.html.erb

1 files changed, 2 insertions, 1 deletions

diff --git a/bower.json b/bower.json
index 1a88511..dbcc01c 100644
--- a/bower.json
+++ b/bower.json
@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.10"
+    "angular": "~1.3.10",
+    "angular-resource": "~1.3.10"
   }
 }