Updated database.yml without user and pass
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
Added Attribute Accessible to User Model. Exclude Admin accessible for security purposes!
Added Before authetication and filters for Devise to Application Controller
Fixed Schema file. Dropped database to achieve rollback.

Merge branch 'master' into dev_luke

Conflicts:
	db/schema.rb
Removed Attr_accessor
Add flight model
Merge pull request #6 from MollyMoile/marcus

Reservation model
Update application_controller.rb

refactor
Merge pull request #5 from MollyMoile/dev_luke

Dev luke
cleaned up shoulda gems
test