Add gitignore for object files
Merge branch 'master' of https://github.com/madisonmay/posterize
Merge branch 'master' of https://github.com/madisonmay/posterize
Basic posterization
Fix merge conflict