trying to make border [2]
Merge remote-tracking branch 'origin/master'

Conflicts:
	CoffeeScript/ballpool.coffee
almost border