Become a programmer, they said. It'll be fun, they said.
You suck
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/marinemc/Bootstrap.java
	src/main/java/org/marinemc/net/handshake/MultiplayerListPacket.java
Become a programmer they said, it will be fun they said.