made changes to flights file
merge the files
added reserving seats functions on flights show page
merging files show page for flights