homepage done
dillon research page
Merge remote-tracking branch 'origin/master' into dillon
merge conflict fix
Merge branch 'dillon' into gh-pages