Automated Modjam Commit:  7:22:45.30
Automated Modjam Commit:  7:37:45.44
Automated Modjam Commit:  7:52:45.28
Automated Modjam Commit:  8:07:45.25
Automated Modjam Commit:  8:22:45.32
Automated Modjam Commit:  8:37:45.25
Automated Modjam Commit:  8:52:45.21
Automated Modjam Commit:  9:07:45.37
Automated Modjam Commit:  9:22:45.88
Automated Modjam Commit:  9:37:47.57
Merge branch 'master' of https://github.com/pixlepix/ElfCraft

Conflicts:
	src/main/java/teamelf/elfcraft/common/entity/EntityElf.java
Automated Modjam Commit:  9:52:48.40
AUTO