layout and format changes
formatting changes
Merge branch 'master' of https://github.com/Hackademy2014/aviation
resolves merge conflicts
Merge branch 'master' of https://github.com/Hackademy2014/aviation
final