added AngularJs functionality & css file
fixed merge conflicts
i don't know.