changed layout in main activity
Merge branch 'camera' of https://github.com/lisarythenlarsson/TensionCamApp into camera