Merge branch 'master' of github.com:drugis/drugis.org

Conflicts:
	about/team.md
Merge branch 'master' of github.com:DanielReid/drugis.org

Conflicts:
	about/team.md