asfs
Merge branch 'master' of https://github.com/cs147win2014/project

Conflicts:
	views/course.handlebars