Collision methods are written. However, they're supposed to be included in entities somehow.
Revert "Collision methods are written. However, they're supposed to be included in entities somehow."

This reverts commit 656a2daf560efde6095cb01edca96324ecc1363c.
Added some collision methods and minor changes, to be implemented further
Merge branch 'master' of https://github.com/Bangiev/JSTeamwork

Conflicts:
	.idea/workspace.xml