Merge pull request #324 from jestevez/master

author iancoleman <1281387+iancoleman@users.noreply.github.com>

Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)

committer GitHub <noreply@github.com>

Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)
author iancoleman <1281387+iancoleman@users.noreply.github.com>
Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)
committer GitHub <noreply@github.com>
Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)
diff --cc src/js/index.js
Simple merge
diff --cc tests/spec/tests.js
Simple merge
author	iancoleman <1281387+iancoleman@users.noreply.github.com>
	Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)
committer	GitHub <noreply@github.com>
	Tue, 30 Apr 2019 01:08:13 +0000 (11:08 +1000)
		1	2
src/js/index.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/spec/tests.js	patch \|	diff1 \|	diff2 \|	blob \| history