Merged changes in bio.txt. Manually, so as to avoid automerge screwing it up.
Merge branch 'master' of github.com:DiscoBizzle/Ghost-Simulator