added mixins, updated .gitignore