collition function
collition function
adsfasd
Merge remote-tracking branch 'origin/master'

Conflicts:
	window
	window.c