mariusl - adding server-favicon npm
mariusl - plm, avatarul gif generating merge conflict!?!?!
Merge branch 'master' of github.com:lucamariusmihai/node
Merge branch 'master' of github.com:lucamariusmihai/node

Conflicts:
	package.json
Merge branch 'master' of github.com:lucamariusmihai/node