Fix local collision detection
Merge branch 'master' of github.com:vladzaharia/drinkingisfun