bad commit
Merged and added camera