edit
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	app/views/courses/index.html.erb
	app/views/lectures/index.html.erb
edit