Merge branch 'master' into patch-3

author Brendan Forster <brendan@github.com>

Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)

committer GitHub <noreply@github.com>

Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)
author Brendan Forster <brendan@github.com>
Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)
committer GitHub <noreply@github.com>
Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)
diff --cc Node.gitignore

index 05c7f17788626b971f549b124bf634864a26c779,7682f9a4558c1924b44140bfb6002ed6b256476a..9ddf79c11a86eeb50253a137d921418149759eb3
--- 1/Node.gitignore
--- 2/Node.gitignore
+++ b/Node.gitignore
@@@ -28,9 -31,8 +31,9 @@@ bower_component
   build/Release
   
   # Dependency directories
- node_modules
- jspm_packages
- typings
+ node_modules/
+ jspm_packages/
++typings/
   
   # Optional npm cache directory
   .npm
diff --cc VisualStudio.gitignore
Simple merge
author	Brendan Forster <brendan@github.com>
	Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)
committer	GitHub <noreply@github.com>
	Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)
		1	2
Node.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
VisualStudio.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history