Added some camera functionality to mainactivity?
ngerge branch 'master' into overall_structure
Merge pull request #4 from johnshaughnessy/overall_structure

Updated MainActivity with basic camera functionality