Merge pull request #5 from khonkhortisan/master

author Anthony <azhang9@gmail.com>

Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)

committer Anthony <azhang9@gmail.com>

Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)
author Anthony <azhang9@gmail.com>
Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)
committer Anthony <azhang9@gmail.com>
Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)
diff --cc README.md
Simple merge
diff --cc functions.lua
Simple merge
diff --cc init.lua
Simple merge
author	Anthony <azhang9@gmail.com>
	Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)
committer	Anthony <azhang9@gmail.com>
	Fri, 31 Aug 2012 04:38:00 +0000 (21:38 -0700)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
functions.lua	patch \|	diff1 \|	diff2 \|	blob \| history
init.lua	patch \|	diff1 \|	diff2 \|	blob \| history