removes merges conflict lines and stephen's comments
Merge pull request #3 from evansimoni/evan

removes merges conflict lines and stephen's comments
cleanup
added tree and orange class and some math benchmarks
adds an Evan class
fixes merge conflict
Merge pull request #4 from Stephenitis/evan

adds an Evan class
wtf
merge conflict