End of the Chapter 6
Merge https://github.com/legios89/trackstar