working on edit page
resolved conflicts
edit page styled
Merge pull request #6 from toddmetheny/edit_account

Edit account