Merge branch 'master' of https://github.com/Proxmark/proxmark3

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b60b57ee6aeee106ec856afc5545795dcb07f39..4077d37e6269ff6b95724a4b90641181742711eb 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
 
+### Changed
+
+### Fixed
+
+### Added
+
+## [3.0.0][2017-06-04]
+
 ### Added
 - Added hf mf hardnested, an attack working for hardened Mifare cards (EV1, Mifare Plus SL1) where hf mf nested fails
 - Added experimental testmode write option for t55xx (danger) (marshmellow)