Initial commit
Adding Trax
Merge branch 'master' of github.com:Ianpwest/Trax

Conflicts:
	README.md