stuff
lots of emails
Merge branch 'master' of https://github.com/janesternbach/BarCode
taking out that terrible black box
fiex conflicts
check ins
resolved merge conflicts
merge conflicts
tons of styling