comi
ccasdjalsdj

Conflicts:
	img/background/bg_1.png