style for diff screens
Merge branch 'master' into develop
update gitignore