Merge branch 'master' of https://github.com/qinfchen/DefinitelyTyped

Conflicts:
	sigmajs/sigmajs.d.ts

sigmajs/sigmajs.d.ts

@@ -99,6 +99,7 @@ declare module SigmaJs{
         render(): Sigma;
         resize(): Sigma;
         settings(settings: { [index: string]: any }): void;
+        settings(settings: { [index: string]: any }): void;
     }
 
     interface RendererConfigs{