edit...
resolved conflicts
Merge pull request #5 from wgallop99/master

Added angular services