Merge branch 'develop'

Conflicts:
	Leapfile
	files/ssh/authorized_keys

1 files changed, 11 insertions, 0 deletions

diff --git a/tags/dc.json b/tags/dc.json
new file mode 100644
index 0000000..3a1ee5c
--- /dev/null
+++ b/tags/dc.json
@@ -0,0 +1,11 @@
+{
+  "location": {
+    "name": "Washington D.C.",
+    "country_code": "US",
+    "timezone":"-5",
+    "hemisphere": "N"
+  },
+  "ssh": {
+    "port": 22
+  }
+}