Merge pull request #92 from jonspock/master

author iancoleman <coleman.ian@gmail.com>

Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)

committer GitHub <noreply@github.com>

Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)
author iancoleman <coleman.ian@gmail.com>
Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)
committer GitHub <noreply@github.com>
Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)
diff --cc bip39-standalone.html
Simple merge
diff --cc src/js/index.js
Simple merge
author	iancoleman <coleman.ian@gmail.com>
	Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)
committer	GitHub <noreply@github.com>
	Tue, 22 Aug 2017 23:30:43 +0000 (09:30 +1000)
		1	2
bip39-standalone.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/js/index.js	patch \|	diff1 \|	diff2 \|	blob \| history