Renamed the file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/test/App.java