From: Martin Holst Swende <martin@swende.se>
Date: Fri, 28 Mar 2014 11:27:38 +0000 (+0100)
Subject: Merge pull request #9 from doegox/addhelpm
X-Git-Tag: v1.0.0~2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/046f3dfa7c818ef45815d37abf2407cafacde961?hp=19e2a10de5cdf7f6f366e5f43f0cacc662ff800a

Merge pull request #9 from doegox/addhelpm

Merged Addhelp -h / Markdown help -m, it now does not crash on windows (http://www.proxmark.org/forum/viewtopic.php?pid=10461#p10461)
---

diff --git a/_Sidebar.md b/_Sidebar.md
new file mode 100644
index 00000000..fcffb6c0
--- /dev/null
+++ b/_Sidebar.md
@@ -0,0 +1,10 @@
+# Proxmark Wiki
+ * [Home Page](HomePage)
+ * [Getting Started](GettingStarted)
+ * [Hardware](Hardware)
+ * *Software / firmware*
+  * [Linux (Gentoo)](Gentoo Linux)
+  * [Windows](Windows)
+ * *Usage*
+  * [EM4102 Walk through](EM4102 1.pm3 Walkthrough)
+  * [Command Reference](commands)
\ No newline at end of file
diff --git a/images/Hirose-connector.png b/images/Hirose-connector.png
new file mode 100644
index 00000000..4c169037
Binary files /dev/null and b/images/Hirose-connector.png differ
diff --git a/images/prox3-straight.jpg b/images/prox3-straight.jpg
new file mode 100644
index 00000000..10668b77
Binary files /dev/null and b/images/prox3-straight.jpg differ
diff --git a/images/proxmark3-parts-2.jpg b/images/proxmark3-parts-2.jpg
new file mode 100644
index 00000000..c56d0df0
Binary files /dev/null and b/images/proxmark3-parts-2.jpg differ