sdf:
Merge branch 'master' of https://github.com/Chaosed0/Duello

Conflicts:
	something.txt
Merge branch 'master' of https://github.com/Chaosed0/Duello