cindy's update
Merge branch 'master' of github.com:mykebates/Zoo

Conflicts:
	About/index.html