I can't remember what I've changed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dsh105/holoapi/HoloAPI.java
	src/main/java/com/dsh105/holoapi/api/Hologram.java
	src/main/java/com/dsh105/holoapi/api/HologramFactory.java
	src/main/java/com/dsh105/holoapi/command/CommandManager.java