Merge remote-tracking branch 'upstream/master' into typescript_build_2

author Daniel Imms <daimms@microsoft.com>

Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)

committer Daniel Imms <daimms@microsoft.com>

Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)
author Daniel Imms <daimms@microsoft.com>
Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)
committer Daniel Imms <daimms@microsoft.com>
Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)
diff --cc .gitignore

index bd01149502afd390153ea2d8e57e797c606cc880,2e91366a4423e844e9e8c513e8e0800ef6ccdc33..a8029f56da898b85fd010816593c2a33d0c32926
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -11,4 -11,4 +11,5 @@@ example/*.lo
   docs/
   npm-debug.log
   /.idea/
+ +typings/
+ .env
diff --cc package.json
Simple merge
diff --cc test/test.js
Simple merge
author	Daniel Imms <daimms@microsoft.com>
	Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)
committer	Daniel Imms <daimms@microsoft.com>
	Tue, 1 Nov 2016 02:29:36 +0000 (19:29 -0700)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
test/test.js	patch \|	diff1 \|	diff2 \|	blob \| history