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

Conflicts:
	index.js