basic profile page complete, working on edit page
profile edit page functioning properly, moving on to styling
Merge branch 'master' of https://github.com/henry-p/amigos into profile
fixed user show controller
Merge pull request #7 from henry-p/profile

Profile page and edit page complete