add colision detection
Merge branch 'master' of github.com:micnic/Best-Hackaton

Conflicts:
	public/js/models/BaseModel.js