Merge pull request #30 from JMtorii/dev

Pulling Agnes' changes.
Added Agnes' my story page
Merge pull request #31 from JMtorii/master

Merging from master