Merge pull request #4 from gangstead/master

Angular working