Remove errant return statement
Add airplane project
Fix merge conflicts