fix
Merge branch 'master' of https://github.com/rill-l33t/Makeup
fix gitignore