start of hooking up
eheh
fixed merge
Merge pull request #13 from CanvasApp/userCtrl

User ctrl