New project in Android studio
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
First commit