User update error
Merge branch 'master' of github.com:chrispeterson3/gearlance