halfway through adding new users
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05.git