Merge 7e23d1e into 236916d

Gemfile.lock

@@ -88,6 +88,9 @@ GEM
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.1.0)
@@ -204,15 +207,16 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.16.3)
-    turbolinks (5.1.1)
-      turbolinks-source (~> 5.1)
-    turbolinks-source (5.1.0)
+    turbolinks (5.2.0)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.18)
@@ -243,6 +247,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   coveralls
   devise
+  haml
   jbuilder (~> 2.5)
   letter_opener
   listen (>= 3.0.5, < 3.2)