Merge pull request #20 from hashr25/Randy

Camera and Text
Merge branch 'master' into Randy