worked on mainactivity
deleted extra mainactivity.java
Merge pull request #5 from johnshaughnessy/overall_structure

Updated MainActivity with more basic camera functionality