conflit draw rectangle

Conflicts:
	app/public_html/js/main.js