Update year and email
Merge branch 'master' of https://github.com/rui-lin/rlin.ca