renamed some file, changed content and moved to another folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	fixrenamed.txt