Merge branch 'master' of github.com:hmgoalie35/Program3 into conor
add makefile
add driver, started flight class
Merge branch 'dev' into conor