Begin manual merge because changes were so large that git treated changes as delete/add instead of modify
Added missing files
Merged all relevant code changes in master except those from a03a69e6939e905b31bd4f9650ef969419e5eb17 for files CanonCamera.java, CanonCommand.java, and did not add the '.get()' to relevant commands in E02_Simpler.java and E04_LiveView.java since these depend on the other two files