Merge remote-tracking branch 'upstream/master'

pull latest

1 files changed, 1 insertions, 1 deletions

diff --git a/typescript.html.markdown b/typescript.html.markdown
index 8173aac8..9f04169a 100644
--- a/typescript.html.markdown
+++ b/typescript.html.markdown
@@ -13,7 +13,7 @@ This article will focus only on TypeScript extra syntax, as oposed to [JavaScrip
 
 To test TypeScript's compiler, head to the [Playground] (http://www.typescriptlang.org/Playground) where you will be able to type code, have auto completion and directly see the emitted JavaScript.
 
-```ts
+```js
 //There are 3 basic types in TypeScript
 var isDone: boolean = false;
 var lines: number = 42;