new file:   client/helpers/breadcrumb.html
	new file:   client/helpers/breadcrumb.litcoffee
	modified:   client/router/router.litcoffee
	new file:   client/views/courses/coursePanel.html
	modified:   client/views/home/home.html
	modified:   client/views/home/slider/slider.css
	new file:   client/views/topics/topi.html
	new file:   client/views/topics/topic.litcoffee
	new file:   client/views/topics/topicList.html
	modified:   lib/slate.css
Merge branch 'master' of https://github.com/charlesjshort/learn

Conflicts:
	client/views/home/home.html

	modified:   client/views/home/home.html
	modified:   client/views/home/slider/slider.html
	modified:   packages/.gitignore
	modified:   server/fixtures2.litcoffee