created and seeded weekdays and hours
merged files
added relationship location flight
added relationships
added a spec file for gabes feature
added some integration tests for sign in log in
flightpage test spec
Merge branch 'master' of https://github.com/gdomingu/orbitalexpress
Creating spec for integration testing
created flight spec
adding flightpage spec
Merge branch 'master' of https://github.com/gdomingu/orbitalexpress
trying to get my local copy up to the head of master
added search box to Flight index page
reservation model association tests
Merge branch 'reservation_test'
flight reservation association tests
added ajax sign in and log up
 all specs for ajax sign up login pass woot
deleted application.html.erb trying to get foundation to work
Merge branch 'ajaxsignup'
Deleted schema.rb.orig