crashes
Merge branch 'master' of http://github.com/bryantp/SaveThePlumber
Added Camera