Fourth Observation, April 25, 2013
Merge branch 'master' of https://github.com/geppettodivacin/ecology

Conflicts:
	ecology.md