minor style updates
Updating profile view
minor style updates
Updating profile view
Added karma setup and spec files
fixed rebase conflict for tests
master conflict res
Fixed travis errors
added angular mocks
Merge pull request #115 from RTakes/master

Added angular-mocks to npm for testing
Merge pull request #116 from Street-Meet/staging

Merging test suite updates from stage