removed fan, added takuya
Corrected formatting
Merge pull request #937 from phantomkirby/master

Replaced a team member.