added angular, fixed the styles to be back to where they were.
ANGULAR IS DOING THINGS
Merge remote-tracking branch 'origin/master'