Icons for stations
Merge branch 'markers'

Conflicts:
	ShortStop/ShortStop.xcodeproj/project.pbxproj
Updated .gitignore