Fixed the about rissa page
Merge branch 'master' into rissa
Merge pull request #59 from TAwesome/rissa

Rissa
no message
Merge branch 'master' into jill
Merge pull request #60 from TAwesome/Jacob

no message
Merge branch 'master' into jill