Merge branch 'master' of https://github.com/ConnorStroomberg/drugis.org
Merge branch 'master' of https://github.com/ConnorStroomberg/drugis.org
Improve 'about'
Add github link to about
team fixes; add daan mugshot
Merge branch 'master' of github.com:DanielReid/drugis.org

Conflicts:
	about/team.md