commit before pulling
Merge branch 'master' of https://github.com/manicwombat/turnitup-beta.git
edit setUpUSer()