Revert "Fixed some mistakes that were left from the previous commit."

This reverts commit 416b347a2ceaab1cd52ea7043e3b60de24b10477.
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18

Conflicts:
	src/utils/CollisionDetection.java
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.