added all changes before prettify
Merge branch 'master' of https://github.com/josephlewis42/autopilot