createing conflict from temp
creating conflict 2 from temp
Merge branch 'master' of github.com:slam02/ubuntu-vim-nodejs

Conflicts:
	temp.txt