init window with scrolling implemented
fixed merge conflict fixed
cleaned up repo
fixed extra file
merged in master