commit on branch fist
Merge branch 'firstFeature'

Conflicts:
	hello.js