Merge branch 'master' into implementFirstExchangeMethod

# Conflicts:
#	package.json
#	src/ts/0x.js.ts
#	src/ts/globals.d.ts
#	src/ts/types.ts

1 files changed, 5 insertions, 0 deletions

diff --git a/src/ts/globals.d.ts b/src/ts/globals.d.ts
index 04328509a..30225d0d8 100644
--- a/src/ts/globals.d.ts
+++ b/src/ts/globals.d.ts
@@ -1,4 +1,5 @@
 declare module 'chai-bignumber';
+declare module 'bn.js';
 
 declare interface Schema {
     id: string;
@@ -51,3 +52,7 @@ declare function promisify(original: any, settings?: any): ((...arg: any[]) => P
 declare module 'es6-promisify' {
     export = promisify;
 }
+
+declare module 'ethereumjs-abi' {
+    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
+}