commit
Merge https://github.com/kmangutov/garden2

Conflicts:
	.gitignore