Merge branch 'dev'
Merge branch 'master' into dev
Move external links into Biography section
Merge pull request #4 from conradarcturus/dev

Dev