5th
happy ending 6th
6th
Merge remote-tracking branch 'githubsndrepo/master' into conflictbran

Conflicts:
	HelloWorld/.gitignore
	HelloWorld/src/com/example/git/Hello.java
Merge branch 'conflictbran'

Conflicts:
	HelloWorld/src/com/example/git/Hello.java
short change