t
master commit
Merge branch 'firstBranch'

Conflicts:
	src/index.js
master commit
ˆ
Merge branch 'branch2'
;
;