changed files to be up to date with newest changes
Merge pull request #24 from lilfade/butterflyknife

changed files to be up to date with newest changes