First upload
Merge branch 'master' of github.com:eriktisme/trinity