Added edit and index
added show
Merge branch 'master' of https://github.com/penabianca/ImagineWare
Before I pull
Merge branch 'master' of https://github.com/penabianca/ImagineWare
Merge branch 'master' of https://github.com/penabianca/ImagineWare

Conflicts:
	app/controllers/course_controller.rb
	app/controllers/courses_controller.rb~
	app/models/course.rb~
	app/views/courses/index.html.haml
Merge branch 'master' of https://github.com/penabianca/ImagineWare
Spec commented