Added description to conference and program segment to splash

Added tracks to program component

Rebased and updated the new navigation for splash

app/models/conference.rb

@@ -74,7 +74,7 @@ class Conference < ActiveRecord::Base
   # Checks if the user is registered to the conference
   #
   # ====Args
-  # * +user+ -> The user we check for 
+  # * +user+ -> The user we check for
   # ====Returns
   # * +nil+ -> If the user doesn't exist
   # * +false+ -> If the user is registered

app/views/conference/_program.html.haml

@@ -13,3 +13,6 @@
         %span You can find the complete schedule in our
         %span
           = link_to 'Master Schedule', conference_schedule_path(@conference.short_title), target: '_blank'
+  -if !@conference.tracks.blank?
+    = render 'tracks'
+

app/views/conference/_tracks.html.haml

@@ -0,0 +1,9 @@
+%div.row
+  %div.col-md-12
+    %h2 Tracks
+    - @conference.tracks.each do |t|
+      %div.col-md-4
+        %h4 
+          = t.name
+        %p
+          = t.description