merging
Merge pull request #8 from jpark3000/profile_page

merging