Merge branch 'master' of C:\Users\Thomas\Android studioProjects\slidesnap with conflicts.
Merge remote-tracking branch 'origin/master'
Code to see if we can go to a new activity after the picture has been taken.