Attempt at fixing collision detection and bounce
Alter collision detection again and refactor structs
Merge branch 'master' into bugfix/collision-rewrite

Conflicts:
	src/main.rs