ignore what i don't want in version control
Merge branch 'master' of https://github.com/jgbkid/base