Added labels to map to differentiate between a stop and a vehicle
Merge branch 'master' of https://github.com/blakewellington/CS457Project

Conflicts:
	Code/HtmlBuilder.lhs