all broken still
signIn, signUp added to user controller
angular stuff
merge conficts resolved
Merge pull request #7 from CanvasApp/angSkel

Ang skel