Merge remote-tracking branch 'origin/master'

Conflicts:
	FirstGitProject/src/com/bw30/test/HelloWorld.java
Merge remote-tracking branch 'origin/issue2' into issue2

Conflicts:
	FirstGitProject/src/com/bw30/test/AAA.java
	FirstGitProject/src/com/bw30/test/HelloWorld.java
	FirstGitProject/src/com/bw30/test/StashTest.java