home changes of no importance
fixed conflicts

Conflicts:
	rename_reg.py
deleted extra test files