rename
Merge branch 'rename'

Conflicts:
	8-queens.c