Merge branch 'angular-app'

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

1 files changed, 1 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index b43fd2f..4d32fcc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+# gem 'coffee-rails', '~> 4.1.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby