Merge pull request #55 from KyleW/eric

User Account Dashboard appears working
Merge branch 'master' into eric