Pooja changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	FooRepoProj/src/Apple.java
	FooRepoProj/src/Class1.java
	FooRepoProj/src/Class2.java
	FooRepoProj/src/testFile1.java