Added coloured markers and rudimentary assignation syntax
Remove backup files
Fix pin colouring conditional
Remove unwanted file
Merge remote-tracking branch 'origin/map-attlebish' into map

Conflicts:
	map/index.html