gto and trillality updated and added, respectively
Merge branch 'master' of github.com:occamsRZR/org