my garden page
detail changes
Merge branch 'master' of https://github.com/ishg/Team12

Conflicts:
	public/index.html