android studio .gitignore
Merge branch 'master' of https://github.com/bmoffatt/home

Conflicts:
	.gitignore
project initial