fixed errors
Merge branch 'master' into irunner
fixed bio
fixing link
test
Merge branch 'jrouly'

merging