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

Angular