Properly escape "&"
Add frick fellowship
Merge branch 'frick'
CAA