FISHY!
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/com/ilexiconn/jurassicraft/data/entity/entity/EntityCoelacanth.java
	src/main/java/com/ilexiconn/jurassicraft/data/entity/jurassicraft.cfg

	src/main/java/com/ilexiconn/jurassicraft/data/entity/render/RenderCoelacanth.java