added screenshot of app
merged code