Fixed timers
Merge branch 'master' of https://github.com/jonathanrelf/HackTrack

Conflicts:
	HackTrack/HackTrack/Controllers/HomeController.cs
	HackTrack/HackTrack/Models/TrackData.cs
	HackTrack/HackTrack/Views/Home/Index.cshtml