user index test created
Merge branch 'dev' into angular_tests
broken tests for broken code
added more templates
Merge pull request #31 from CanvasApp/styles

added more templates
user index test broken
controller fail
user shit
attempts
user template ng repeat
Merge pull request #32 from CanvasApp/angular_tests

Angular tests
merge conflicts