first working state, resolved conflicts

Conflicts:
	names.py
	renamer.py