changed some stuff
Merge branch 'master' of github.com:Philenox/ti_collab