Messed with Views
Merge remote-tracking branch 'origin/master'
Done with stroyboard
Merge remote-tracking branch 'origin/master'