kirei
branchMerge branch 'master' of http://github.com/cohalz/sandbox into cohalz-master
kirei
Conflicts:
	README.md
Merge branch 'cohalz-master'