untrack bagOfns.pyc
untrack __init__.pyc
Merge branch 'CeO2' of https://github.com/andyofmelbourne/Ptychography into CeO2