califonia to new york
change new york to florida
change new york to colorado
Merge branch 'big-conflict'

Conflicts:
	README.md