Added mailcatcher and instructions in the Gemfile to view confirmation emails
Merge branch 'C1_mennaamr_#40_Registration' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#40_Registration

Conflicts:
	Idearator/Gemfile
Updated UML
Added OmniAuth gem
Added Omniauth-facebook gem
Added omniauth initializer
Added sessions_controller
Added Facebook login files
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#91_Facebook_login
      puts

Conflicts:
	Idearator/app/controllers/sessions_controller.rb
	Idearator/config/initializers/omniauth.rb
Updated Facebook login files
Merge branch 'master', remote-tracking branch 'origin' into C1_mennaamr_#91_Facebook_login

Conflicts:
	Idearator/app/controllers/home_controller.rb
	Idearator/app/controllers/users_controller.rb
	Idearator/app/models/user.rb
	Idearator/app/views/home/index.html.erb
	Idearator/config/routes.rb
	Idearator/db/schema.rb
Merge branch 'C1_mennaamr_#91_Facebook_login' into C1_mnzaki_#74_twitter_login

Conflicts:
	Idearator/db/schema.rb
Merge branch 'master' into C1_mnzaki_#74_twitter_login
Add omniauth-twitter, twitter app secrets, devise integration.

Issue #74
Add omniauth-twitter, twitter app secrets, devise integration.

Issue #74
Update Gemfile.lock
Generalize the omniauth callback.

Issue #74
The callback is going to be very similar for most providers anyway
Add twitter login logic.

Issue #74
User can login via twitter. Username clashes are handled.
Merge branch 'master' into C1_mnzaki_#74_twitter_login

Conflicts:
	Idearator/app/models/user.rb
	Idearator/app/views/layouts/_navigation.html.erb
	Idearator/app/views/layouts/application.html.erb
Fix up routes.rb.

Remove remnants of bad commit from earlier merge.