messed with user routes
Merge branch 'master' of github.com:Adalden/connection-tester
Merge branch 'master' of github.com:Adalden/connection-tester
finished all user stuff