part 4 of conflict test
Merge branch 'master' of github.com:sbijoshj/gitXperiment

Conflicts:
	src/fake.js