Merge pull request #1 from drivern/Nick

Nick
Merge branch 'master' of https://github.com/drivern/Unshackled
Camera set up