site tree work
Merge branch 'master' of git://github.com/StudentLifeMarketingAndDesign/division-elearning-project

Conflicts:
css/app.css
css/app.css.map
scss/app.scss
templates/ElearningCoursePage.ss
templates/Layout/ElearningCourseHome.ss
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/division-elearning-project

Conflicts:
	css/app.css
	css/app.css.map
	scss/app.scss
	templates/ElearningCoursePage.ss
	templates/Layout/ElearningCourseHome.ss