delete face_1A
Merge branch 'master' of https://github.com/WinterCoding2014/spike-knockout

merge with erica