testing out versioning
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
Create README.md
Update and rename readme.rtf to README.md
Update README.md
Merge branch 'master' of github.com:ConservationInternational/teamcode
Ignore .DS_Store files from macs.