working main storyboard
changed size autosize of main storyboard
Resolved merge conflict with nick