index changes
fixing merge conflicts
Merge branch 'master' of https://github.com/MarcoMorawec/SIB_HeadShots