Merge pull request #2 from mbeall/master

Trinity 0.2
Update README.md
Update TODO.md
Merge pull request #1 from starverte/master

Merge from master