first commit
style changes
merging from master
reinitializing branch
model testing exists and passes
merged with flights branch