merge with origin

app/views/layouts/application.html.erb

@@ -42,7 +42,20 @@
     </section>
 
     <!-- Main Content -->
-    <section class="content">        
+    <section class="content"> 
+       <% flash.each do |type, message| %>
+          <% if type == "notice" 
+               color = "alert-success"
+            elsif type == "error"
+                color = "alert-danger"
+            else
+                color = "bg-black"
+            end %>
+            
+            <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+                data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+            </p>
+        <% end %>       
         <%= yield %>     
     </section>
 </body>