Merge pull request #233 from schollz/master

author Zachary Yedidia <zyedidia@gmail.com>

Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)

committer GitHub <noreply@github.com>

Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)
author Zachary Yedidia <zyedidia@gmail.com>
Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)
committer GitHub <noreply@github.com>
Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)
diff --cc cmd/micro/buffer.go
Simple merge
diff --cc cmd/micro/micro.go
Simple merge
author	Zachary Yedidia <zyedidia@gmail.com>
	Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)
committer	GitHub <noreply@github.com>
	Wed, 31 Aug 2016 20:39:30 +0000 (16:39 -0400)
		1	2
cmd/micro/buffer.go	patch \|	diff1 \|	diff2 \|	blob \| history
cmd/micro/micro.go	patch \|	diff1 \|	diff2 \|	blob \| history