gitignore
Merge branch 'master' of github.com:walkerart/garden

Conflicts:
	.gitignore
ignore source/images/tiles
Merge branch 'master' of github.com:walkerart/garden

Conflicts:
	.gitignore
ignore binstubs
update gemfile