Initial commit
Merge branch 'master' of https://github.com/nak411/AppexZeldaThemeAndroid
Removed .gradle from git index
Added .gradle to gitignore
Merging in master
Resolving conflicts