commit
some changes from laptop

we'll figure it out
Merge branch 'master' of https://github.com/wildflower/SCMTurboCharge

Conflicts:
	Champion_Cat 2_Cons  hist_mth.sql
	Sunrise_registry events for an icp.sql
	sunrise_registry and eiepa info.sql