Merge pull request #21 from otters-2014/tests

Tests
added test for User#update
User Controller tests for updated added