reorg and working user add
Merge branch 'master' of github.com:howardc93/foodpoints into auth