Rewriting coffeescript constructor
Creating SASS for unordered list as a tree structure
Creating error handling for missing resource (404)
Services changes for displaying on the site
Merge branch 'master' of github.com:tykus/horizon

# By Brian (7) and Brian O'Sullivan (4)
# Via Brian
* 'master' of github.com:tykus/horizon:
  Dynamically recolor faqs when selected
  Adding coffeescript for FAQ site page
  Getting the last_login data on the users index page in admin
  Fixing CoffeeScript
  Updating home partial and view composer to use the Contents model instead
  Fixing the summernote editor
  Updating Seed files
  Adding seeds for the contents table
  Adding in the view, model and controller for content resource
  Adding routes for Contents resource
  Creating Contents table

Conflicts:
	public/css/main.min.css
Fixing Eloquent query
Merge branch 'master' of ssh://10.0.0.14/volume1/git/horizon

* 'master' of ssh://10.0.0.14/volume1/git/horizon:
  Fixing Eloquent query
  Services changes for displaying on the site
  Creating error handling for missing resource (404)
  Creating SASS for unordered list as a tree structure
  Rewriting coffeescript constructor

Conflicts:
	public/css/main.min.css