edited java file
Merge branch 'master' of https://github.com/sgiang92/FillerCreepForAndroid

Conflicts:
	src/TestClass.java