added comment
additional changes
added header comment
Merged feature branch
added version tag
added comment
Merge branch 'feature2'
ver change
updates, add raven
Merge branch 'feature3'

Conflicts:
	Hello.java
Merge branch 'master' of https://github.com/caratang/firstRepo-test

Conflicts:
	Hello.java