everything back working
Merge branch 'master' of https://github.com/brentproost/Projectjes