trying to make a merge conflict
Merge branch 'master' of github.com:broinjc/js-play
manually fixing a merge conflict
Conflicts:
	README.md