armor/tests/localMatchingShiftedCorr201403121140.py
resolving conflict with .gitignore