commit before pull
Merge branch 'master' of https://github.com/ColinWaddell/FaceTache
updated icon set
updated icon set
Settings now works