add .gitignore
conflict
Merge branch 'didntrename' of https://github.com/gitforschool/FillerCreepForAndroid into didntrename

Conflicts:
	newfile.txt