setting up reservation rails stuff
Merge branch 'master' of https://github.com/mike1372/burning-airlines
flight css added
Merge branch 'master' of https://github.com/mike1372/burning-airlines
updated apps.js
added row and column to reservations
Merge pull request #14 from gina8sis/master

Morning merge
Merge pull request #15 from gafrong/master

flight css and apps.js updated
test pull request
Merge pull request #16 from gafrong/master

row and column added to reservations
added search
styling flights page
Merge pull request #17 from gafrong/master

added search
Added reservations table
reservation title added
Merge pull request #20 from gafrong/master

reservation title added
Conflict fix
Merge branch 'joshricha-master'
Forgot to remove a line
Merge branch 'master' of https://github.com/mike1372/burning-airlines