stuff
lots of emails
Merge branch 'master' of https://github.com/janesternbach/BarCode
fiex conflicts