added angular files to the project
Merge pull request #4 from CTFigueroa/master

added angular files to the project
fixed merge conflicts