repackaed in slate theme
Merge branch 'master' of https://github.com/uscsom/learn into slate

Conflicts:
	.meteor/packages
	.meteor/release
	client/main.html
	client/router/router.litcoffee
	client/views/about/about.html
	client/views/home/home.html
	client/views/home/home.litcoffee
	client/views/nav/navigation.html
	packages/.gitignore
	smart.json
	smart.lock