add devise
added course scaffold
Merge branch 'master' of https://github.com/lclouds/cloud-lab

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	log/development.log
	public/index.html.1