Working on cleaning up project.
Merge branch 'master' of https://github.com/Pigmassacre/BarcodeScanner