creating conflict 3 from root
Merge branch 'master' of github.com:slam02/ubuntu-vim-nodejs

Conflicts:
	temp.txt