Merge origin/master

Conflicts:
	.gitignore
	sprites/Thumbs.db
	sprites/wall.png
	src/collisions/Collisions.java
	src/collisions/RectPrism.java
	src/collisions/Triangle.java
	src/collisions/Vector.java
	src/engine/BoundingBox.java
	src/engine/Game.java
	src/engine/Room.java
	src/entities/Entity.java
	src/entities/MovingEntity.java
	src/entities/Player.java
	src/entities/Wall.java