Started making angular services
Fixed merge conflicts