Merge pull request #4 from johnshaughnessy/overall_structure

Updated MainActivity with basic camera functionality
Accidentally used master branch
worked on mainactivity
deleted extra mainactivity.java