Add styling
fix merge error
Pull in flight stuff
Fix merge error in index.html
Merge pull request #8 from donnieberg/angular

Angular
sunday AM
Fix angular bug
Merge branch 'master' into angular
Merge pull request #9 from donnieberg/angular

Angular
fixing data problem