Update page1.ts
Update page1.ts

Fixed merge conflict
marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo,marcusasplund/ionic2-camera-demo