added account page - fixing merge conflict
Merge pull request #7 from ssniteman/firstview

added account page - fixing merge conflict