Merge branch 'master' into unavailableFilledCancelled

# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
#	src/types.ts
#	test/exchange_wrapper_test.ts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts
index db8a960ba..932ddf62a 100644
--- a/src/utils/schema_validator.ts
+++ b/src/utils/schema_validator.ts
@@ -6,7 +6,7 @@ import {tokenSchema} from '../schemas/token_schema';
 export class SchemaValidator {
     private validator: Validator;
     // In order to validate a complex JS object using jsonschema, we must replace any complex
-    // sub-types (e.g BigNumber) with a simpler string represenation. Since BigNumber and other
+    // sub-types (e.g BigNumber) with a simpler string representation. Since BigNumber and other
     // complex types implement the `toString` method, we can stringify the object and
     // then parse it. The resultant object can then be checked using jsonschema.
     public static convertToJSONSchemaCompatibleObject(obj: object): object {