Removing upcoming events since we don't have any
Fixing bug in appointment request code that was creating duplicate users
Adding a database constraint to ensure we don't get duplicate users
Adding validation to prevent duplicate email addresses
Break dependency on User in migration
Merge pull request #44 from Devbootcamp/duplicate-user-fix-use-sql-in-migration

Use SQL in migration instead of ActiveRecord
Merge pull request #43 from Devbootcamp/duplicate-user-fix

Fixing bug in appointment request code that was creating duplicate users
set config.secret_key_base, the Rails 4 config key for encrypting cookies
Remove all ActiveRecord mass-assignment settings from configs.

See http://guides.rubyonrails.org/security.html#mass-assignment if
you need help understanding Rails 4 mass-assignment protection
Remove ActiveRecord auto explain feature settings from configs
Merge pull request #47 from Devbootcamp/fix-rails4-deps

Fix Rails deprecation warnings
Create seeds for mentors, availabilties, and an appointment with a mentee
Merge pull request #48 from Devbootcamp/seeds

Create seeds for mentors, availabilties, and an appointment with a mentee
2-column availabilities (front-page) view.

* Less scrolling
* More obvious that it's different content

Uses media queries to break to the old format for "mobile" view
Merge pull request #49 from Devbootcamp/2-column-view

2-column availabilities (front-page) view
Fix home when fewer available than upcoming mentoring
Merge pull request #51 from Devbootcamp/sidebar-clears-right

Fix home when fewer available than upcoming mentoring
Merge branch 'master' of https://github.com/Devbootcamp/mentor-pairing

Conflicts:
	app/assets/stylesheets/screen.css.scss
	app/views/availabilities/index.html.erb
	db/schema.rb