Checking in changes to capture an image

I still need to get a JPEG from the bitmap
Merge branch 'master' of https://github.com/rcjames1004/Hackathon2013