merge gitignore
gradlew to gitignore
added scenarios
merge complete
merging manifest