my local files are safe I think.
Merge branch 'master' of github.com:bayleefeore/balerion_air

Conflicts:
	db/schema.rb
added table to home page
added departure and arrival destination names to table
Merge branch 'master' of https://github.com/bayleefeore/balerion_air

Merging table
change utc datetime to display only date (can change to more readable version later)
added a little bit of css
view for search form is decent. moving on to search logic
added some background images
better background image
search in the home_controller is working pretty well, just have to build the search.js.erb to send it to the table
fixed the seeds.rb to make the flight times more random
Merge branch 'flight_table' into search_isaac

Conflicts:
	app/controllers/home_controller.rb
	config/routes.rb
removed some merge cruft
changed the tables and made ajax search work. the links to the flights that are in the table don't do anything yet. should we have a flight#show view done? @bayleefeore and @franky77
The search test passes now, even though it's weak.
Merge branch 'master' of github.com:bayleefeore/balerion_air
Merge branch 'search_isaac'