Mixins
Modified gitignore
Merge pull request #2 from thejamesdempsey/dev

Dev