Fixed error in global role where bodies of important methods were commented out (!).
Added missing bootstrap dropdown include.
Migrated to Rails 4.1 and Bootstrap 3.2.0.
Modified the courses controller to contain code for the creation of a course only if it is not already present.

Modified the exercises controller to use the user session id and to handle the upload of exercises and mcqs.

Created the OmniAuthCallbacks controller with the facebook and google_oauth2 authentication methods.

Added the gitignore for the YAMM stylesheet

Added the GEM for OMNIAUTH-Google.

Adding the login image for Facebook

Adding the login image for Google

Add the controller for OmniAuth Callback with methods for facebook and google_oauth2

Auto-generated coffee script for Omniauth callback controller

Auto-generated CSS file for Omniauth callback controller

Creating a variable to give a new user session if necessary.

Changed the Workout controller to permit the Rails 4 parameteres.

Auto-generated the callback helper for Omniauth.

Commented out the exercises tags part since it is already covered by saying that Exercises have and belong to many tags.

Created the Identity model for working with Omniauthable

Modified the User model to be Omniauthable and to have the callback methods for Omniauth of Facebook and Google.

Created a new partial to serve as the dropdown from the Sign In.

Modified the search partial for displaying exercises from Search bar in the top navigation.

Modified the Navbar to include the Search bar, Yamm for displaying the dropdowns for Gym, Courses and the Sign In.

Modified the sidebar partial to not display the search partial.

Added the omniauth statements for Faebook and Google.

Modified the routs to include the uploading and creating of exercises via XML and CSV files. Added the Devise statement for OmniAuth
Fixed several bugs.  Started implementing new theming support.
Merge branch 'bs3'

Conflicts:
	.gitignore
	app/models/exercise.rb
	app/views/exercises/_search.html.haml
	config/routes.rb
Deleted some blank lines.
Switched back to the warm theme, since the dark theme isn't ready.
Minor tweaks to the navbar.
Minor tweaks for left sidebar.
Merge branch 'master' into exercise-wip

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/theme/warm/theme.scss
	app/views/exercises/_search.html.haml
	app/views/layouts/_navbar.html.haml
	app/views/layouts/_sidebar.html.haml
	config/routes.rb
	db/schema.rb