test
Merge branch 'master' of github.com:meniscus/cake_test

Conflicts:
	.gitignore
	README.md