Mashed localUser.js and user.js together.
Merge branch 'master' of https://github.com/luketherrien/pokemon-trading-post