First apk deployed
conflicts fixed
with gitignore