My commit
git ignore file
add wrapper and gradle
Resolve merge conflicts