Solution Cleaned
Merge branch 'master' of https://github.com/scarylabcat/TrackTV.git