Changed things
Merge branch 'master' of https://github.com/lamorie/FillerCreepForAndroid

Conflicts:
	newmembers.txt