Undid my (Nick's) changes to UserController.cs
Merge branch 'master' of https://github.com/nmoccia/BootcampCapProject