added user controller test
added user controller test
Merge branch 'master' of https://github.com/bumblebees-2014/LynxShare into zack_controller_tests
fixed a line in links controller
Merge pull request #11 from bumblebees-2014/zack_controller_tests

Zack controller tests