Stuff
Stuff
Stuff
Stuff
fixed stuff
fixed stuff
Trying to fix stuff
Updated Users Controller and Views

Christian said he messed a few up so I am going to try and commit over
his stuff  and add my stuff
Merge branch 'master' of https://github.com/jgeley/UNOClassCaddy
Adding Functionality to controller and view