Reorganizing the teamcode repo. We will try this structure for awhile and then see if we need to create additional repos
changes during demo

Merge branch 'master' of https://github.com/ConservationInternational/teamcode

Conflicts:
	.gitignore