Making progress on user accounts
ugh
Merge branch 'master' of ssh://github.com/dgallegos/rewardAngular
argggg