Merge pull request #67 from MagisterXero/master

Fixed derpy file, Updating AE2.