update
Merge branch 'master' of https://github.com/jakupllarif/Senior-Project

Conflicts:
	SeniorProject/SeniorProject/Controllers/CurrentSpeedController.cs
ups had a confilct