dunnolol
Merge branch 'master' of https://github.com/Felza/54_del3.git

Conflicts:
	54_del3/src/Entity/Player.java
Merge branch 'master' of https://github.com/Felza/54_del3.git
Merge branch 'master' of https://github.com/Felza/54_del3.git
Merge branch 'master' of https://github.com/Felza/54_del3.git
Names
Merge branch 'master' of https://github.com/Felza/54_del3.git