Revert "Change the camera UI"

This reverts commit 1ddc25608e9c2302cd6e8f0fc6138f85bc8c5fda.
Merge branch 'master' of ssh://github.com/Torboto/cmput301W13T07
Attempting to fix camera stuff I broke
Merge