correct conflict in changelog

Merge pull request EmpireProject#121 from PowerShellEmpire/dev

Empire 1.4 release.

Updated version number and changelog for 1.3.1

Merge pull request EmpireProject#74 from pasv/module_dev_paranoia

Invoke-Paranoia

Merge pull request EmpireProject#52 from PowerShellEmpire/skywalker_fix

Skywalker fix

Updated changelog and version for 1.2 release.

Merge pull request EmpireProject#17 from ch33kyf3ll0w/master

Update hta.py to fix line indention.