Added a .gitignore file
modified .git ignore
edited another new file
Merge branch 'didntrename' of https://github.com/emmettu/FillerCreepForAndroid into didntrename

Conflicts:
	anothernewfile