Node.js with nvm
Merge branch 'master' of github.com:mathbruyen/computers

Conflicts:
	computers/aspire.md