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

Conflicts:
	54_del3/src/Boundary/UIManager.java
	54_del3/src/Entity/Strings.java
Merge branch 'master' of https://github.com/Felza/54_del3