Merge pull request #66 from MagisterXero/master

Updating Change Log / Files
Fix MagisterXero Derp
Fixed derpy file, Updating AE2.
There's a freezing issue in AE2, hoping that this fixes it.