BS
Merge branch 'master' into francis-branch
Commit of things and such and potato salad
Merge