adding in new styles
revised gitignore
Merge branch 'master' of github.com:macaroni92/MixFliks