user and location put is working now
Merge branch 'master' of github.com:bbl232/3750WireFrame