rspec and shouldamatchers gems
Updated database.yml without user and pass
accidentally changed database yml file, changed back
Merge branch 'master' into sambox
Merge branch 'master' into dev_luke
Added Migration for Admin column for User
Fixed Add Migration Admin column so default is false
Added User Associations and Validations pending RSpec
Pulled RSpec

Merge branch 'master' into dev_luke
Merge branch 'master' into sambox
fixed conflict with gemfile lock
Added Attribute Accessible to User Model. Exclude Admin accessible for security purposes!
Added Before authetication and filters for Devise to Application Controller
Merge branch 'master' into sambox
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
Fixed Schema file. Dropped database to achieve rollback.

Merge branch 'master' into dev_luke

Conflicts:
	db/schema.rb
Removed Attr_accessor
airplane model initial data
Merge branch 'master' into sambox
add reservation model, test is in rspec syntax, not shoulda matcher