incrop nancy
Merge branch 'master' of https://github.com/21timduncan/c1