Stuff
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime

Conflicts:
	src/main/java/net/jamcraft/chowtime/core/events/EntityEventHandler.java