Android studio git sucks
Merge branch 'master' of https://github.com/R-a-dio/Android-app