Signed-off-by: Holden Cox <segrived@gmail.com>
Merge branch 'master' of http://github.com/segrived/test.git

Conflicts:
	README.md

Signed-off-by: Holden Cox <segrived@gmail.com>