restructured file structures
fixed conflicts
added a scrollview to view large image
storyboard change