added two track system
Merge branch 'master' of github.com:angelaz/shine