Removed some extra code and added comments
Merge remote-tracking branch 'origin/master' into TylersBranch
Tyler fixed the user issues