*) added local node_modules dir to gitignore
Merge branch 'master' of github.com:port/port.github.com

Conflicts:
	.gitignore