Joel affiliation
Merge branch 'master' of https://github.com/spmrl/spmrl-website
Joel affiliation in CfP