barcode works
about view
merge 'about' and 'barcode'
Merge pull request #26 from phil5/master

barcode works, and about page