Proper collision detection with walls and players
Merge branch 'master' of github.com:vladzaharia/drinkingisfun