Pair and Force Changes
Merge branch 'master' of https://github.com/Rhouli/ljmd-c

Conflicts: