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

	modified:   client/views/home/home.html
Merge branch 'master' of https://github.com/charlesjshort/learn

Conflicts:
	client/views/home/home.html