bla bla
Merge branch 'master' of github.com:barnash/git-training

Conflicts:
	index.js
dafasdf
Merge branch 'master' of github.com:barnash/git-training
sdfasdfasdfasdfasdfasfd:wq

Conflicts:
	index.js
Merge branch 'master' of github.com:barnash/git-training