Initial commit
Merge remote-tracking branch 'origin/master' into SecondBranch

Conflicts:
	NewTestGit/src/com/bcsg/Test.java
File modified