one's commit
two's commit
Merge branch 'one' into two

Conflicts:
	file.txt
two's commit
one's commit
merging one and two
Created "NatureSim" and cleaned up "SDL Program December 30th 2012"
This I just copied "SDL Program December 30th 2012" into the "NatureSim" directory.
We will build on that program to make NatureSim.
Merge branch 'master' of https://github.com/jensenr30/Experiments