user updates
Merge branch 'master' of github.com:turnt-able/turnt-able