Added edit and index
added show
Merge branch 'master' of https://github.com/penabianca/ImagineWare
changed signup link back to root_path
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
Removed more buffer files
Removed buffer file for migration
Added acts-as-taggable-on to project and made courses taggable
implemented tag cloud
removed duplicate config files
profile page working
Implemented browse course feature
sign up works
fixed conflict in routes.rb
Merge branch 'master' of github.com:penabianca/ImagineWare
Add SSL in production
image link to home
Merge branch 'master' of https://github.com/penabianca/ImagineWare