merge red with master
Added dashboard style to show.html.erb

Need to put in forms and fix styling
Removed some unneeded files
Gemfile update
update trying to fix carousel
1 error left missing styling
Some resizing
Errors gone Removed stylesheets and javascript files not being used

need to fix some styling. Background color not coming through and side
menu
switched stylesheet order
Merge branch 'master' into bootstrap

Conflicts:
	app/views/courses/new.html.erb
	app/views/users/show.html.erb
fixed conflicts
Some cleaning up
@owned courses not recognized
Merge branch 'bootstrap'
"Merged in Bootstrap branch"
fixed logout