Merge branch 'issue001'

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

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