aaaa
Merge branch 'master' of github.com:GoatHunter/HelloWorld

Conflicts:
	doc.txt
this is from a branch
this is from a branch 2
this is from a branch 3
another javascript
hotfix
major shift
another feature
Merge branch 'feature1-234.1' into feature1-234
Merge branch 'feature1-234'