diff --git a/README.md b/README.md
index e3dd425fda1..9fd7364a2ed 100644
--- a/README.md
+++ b/README.md
@@ -32,4 +32,4 @@ This is by no means complete, but a couple things to know:
4. The `welcome.md` file needs to have a field added to its frontmatter for the alias, i.e., `aliases = ["/events/2015-chicago"]`
5. Sponsors each need a file in the data directory, as such: `data/sponsors/chef.yml`. If there is an existing sponsor and you can use it, you do not need to create the data file (or the image). If your information is different, please create a new file, such as `data/sponsors/2015chicagochef.yml`. Again, no special characters in the filename, please. (Note: there is an experimental feature for an "override" of the sponsor data; more on this feature as it is developed)
6. Put the images for your sponsors in the `/static/img/sponsors` directory. They need to be PNG files and named exactly after the name of the sponsor in your event file (and the corresponding sponsor data file), i.e., `/static/img/sponsors/chef.png`.
-7. You will also want to add your event's logo to the following directory (creating the directory if necessary) `/static/img/yyyy-city/logo.png`. The file MUST be called `logo.png`.
+7. You will also want to add your event's logo to the following directory (creating the directory if necessary) `/static/img/events/yyyy-city/logo.png`. The file MUST be called `logo.png`.
diff --git a/content/events/2016-atlanta/welcome.md b/content/events/2016-atlanta/welcome.md
index 62903d667c9..a6b3a81e0ef 100644
--- a/content/events/2016-atlanta/welcome.md
+++ b/content/events/2016-atlanta/welcome.md
@@ -4,18 +4,18 @@ Year ="2016"
date = "2016-03-06T21:15:25-06:00"
title = "welcome"
type = "event"
-aliases = ["/events/2016-detroit"]
+aliases = ["/events/2016-atlanta"]
+++
## {{< event_start >}} - {{< event_end >}}
-DevOps Days is coming to XXXXXX
+DevOps Days is coming to Atlanta!
-
+
@@ -49,7 +49,7 @@ DevOps Days is coming to XXXXXX
|
- {{< event_twitter devopsdayschi >}}
+ {{< event_twitter devopsdaysatl >}}
|
diff --git a/data/events/2016-atlanta.yml b/data/events/2016-atlanta.yml
index f16d7ce796d..bcf08a653f7 100644
--- a/data/events/2016-atlanta.yml
+++ b/data/events/2016-atlanta.yml
@@ -6,22 +6,43 @@ status: "current" # Options are "past" or "current".
startdate: 2016-04-26 # The start date of your event, in YYYY-MM-DD format. Leave blank if you don't have a date yet.
enddate: 2016-04-27 # The end date of your event, in YYYY-MM-DD format. Leave blank if you don't have a date yet.
cfp_date_start: 2016-04-01
-cfp_date_end: 2016-06-01
-cfp_date_announce: 2016-07-01
+cfp_date_end: 2016-05-01
+cfp_date_announce: 2016-05-07
coordinates: "30.2500, -97.7500" # The corrodinates of your venue. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
-location: "location" # The name of your location
+location: "Georgia Tech Historic Academy of Medicine" # The name of your location
navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "registration", "conduct", "sponsor"] # List of pages you want to show up in the navigation of your page. Remove any that aren't relevent yet.
-team: ["John Doe", "Jane Smith", "Sally Fields"]
+team: ["Tom Hall", "John Dyer", "Ian Buchanan", "Laura Little", "Chris Corriere"]
organizer_email: "organizers-atlanta-2016@devopsdays.org" # Put your organizer email address here
proposal_email: "proposals-atlanta-2016@devopsdays.org" # Put your proposal email address here
sponsors: # List all of your sponsors here along with what level of sponsorship they have.
- id: chef
level: gold
- - id: datadog
+ - id: pivotal
level: gold
+ - id: versionone
+ level: gold
+ - id: redislabs
+ level: gold
+ - id: victorops
+ level: gold
+ - id: autotrader
+ level: gold
+ - id: sumologic
+ level: gold
+ - id: mailchimp
+ level: silver
+ - id: salesforcepardot
+ level: bronze
+ - id: careerbuilder
+ level: bronze
- id: arresteddevops
- level: community
-
+ level: media
+ - id: oreilly
+ level: media
+ - id: blacksintechnology
+ level: media
+ - id: upguard
+ level: badges
sponsor_levels: # In this section, list the level of sponsorships and the label to use.
- id: gold
label: Gold
@@ -29,5 +50,7 @@ sponsor_levels: # In this section, list the level of sponsorships and the label
label: Silver
- id: bronze
label: Bronze
- - id: community
- label: Community
+ - id: media
+ label: Media
+ - id: badges
+ label: Badges
diff --git a/data/sponsors/autotrader.yml b/data/sponsors/autotrader.yml
new file mode 100644
index 00000000000..78579b3e620
--- /dev/null
+++ b/data/sponsors/autotrader.yml
@@ -0,0 +1,3 @@
+
+name: "AutoTrader"
+url: "http://www.autotrader.com"
diff --git a/data/sponsors/blacksintechnology.yml b/data/sponsors/blacksintechnology.yml
new file mode 100644
index 00000000000..4c88feaa532
--- /dev/null
+++ b/data/sponsors/blacksintechnology.yml
@@ -0,0 +1,3 @@
+
+name: "Blacks in Technology"
+url: "https://www.blacksintechnology.net"
diff --git a/data/sponsors/careerbuilder.yml b/data/sponsors/careerbuilder.yml
new file mode 100644
index 00000000000..84a13903872
--- /dev/null
+++ b/data/sponsors/careerbuilder.yml
@@ -0,0 +1,3 @@
+
+name: "CareerBuilder"
+url: "http://www.careerbuilder.com"
diff --git a/data/sponsors/mailchimp.yml b/data/sponsors/mailchimp.yml
new file mode 100644
index 00000000000..6d785cecf61
--- /dev/null
+++ b/data/sponsors/mailchimp.yml
@@ -0,0 +1,3 @@
+
+name: "Mailchimp"
+url: "http://www.mailchimp.com"
diff --git a/data/sponsors/oreilly.yml b/data/sponsors/oreilly.yml
new file mode 100644
index 00000000000..97851be1a69
--- /dev/null
+++ b/data/sponsors/oreilly.yml
@@ -0,0 +1,3 @@
+
+name: "O'Reilly"
+url: "http://www.oreilly.com"
diff --git a/data/sponsors/pivotal.yml b/data/sponsors/pivotal.yml
new file mode 100644
index 00000000000..88c49cac875
--- /dev/null
+++ b/data/sponsors/pivotal.yml
@@ -0,0 +1,3 @@
+
+name: "Pivotal"
+url: "http://www.pivotal.io"
diff --git a/data/sponsors/redislabs.yml b/data/sponsors/redislabs.yml
new file mode 100644
index 00000000000..4327a5048c1
--- /dev/null
+++ b/data/sponsors/redislabs.yml
@@ -0,0 +1,3 @@
+
+name: "RedisLabs"
+url: "http://www.redis.com"
diff --git a/data/sponsors/salesforcepardot.yml b/data/sponsors/salesforcepardot.yml
new file mode 100644
index 00000000000..1ce81e4fc58
--- /dev/null
+++ b/data/sponsors/salesforcepardot.yml
@@ -0,0 +1,3 @@
+
+name: "Salesforce Pardot"
+url: "http://www.twitter.com/pardoteng"
diff --git a/data/sponsors/sumologic.yml b/data/sponsors/sumologic.yml
new file mode 100644
index 00000000000..0b3840b2db8
--- /dev/null
+++ b/data/sponsors/sumologic.yml
@@ -0,0 +1,3 @@
+
+name: "SumoLogic"
+url: "http://www.sumologic.com"
diff --git a/data/sponsors/versionone.yml b/data/sponsors/versionone.yml
new file mode 100644
index 00000000000..5fcd80d10a6
--- /dev/null
+++ b/data/sponsors/versionone.yml
@@ -0,0 +1,3 @@
+
+name: "VersionOne"
+url: "http://www.versionone.com"
diff --git a/data/sponsors/victorops.yml b/data/sponsors/victorops.yml
new file mode 100644
index 00000000000..13a32340f7a
--- /dev/null
+++ b/data/sponsors/victorops.yml
@@ -0,0 +1,3 @@
+
+name: "VictorOps"
+url: "http://www.victorops.com"
diff --git a/static/img/sponsors/autotrader.png b/static/img/sponsors/autotrader.png
new file mode 100644
index 00000000000..7ef2a1253be
Binary files /dev/null and b/static/img/sponsors/autotrader.png differ
diff --git a/static/img/sponsors/blacksintechnology.png b/static/img/sponsors/blacksintechnology.png
new file mode 100644
index 00000000000..f3cd578639a
Binary files /dev/null and b/static/img/sponsors/blacksintechnology.png differ
diff --git a/static/img/sponsors/careerbuilder.png b/static/img/sponsors/careerbuilder.png
new file mode 100644
index 00000000000..90240eb14ac
Binary files /dev/null and b/static/img/sponsors/careerbuilder.png differ
diff --git a/static/img/sponsors/mailchimp.png b/static/img/sponsors/mailchimp.png
new file mode 100644
index 00000000000..357f9dd585b
Binary files /dev/null and b/static/img/sponsors/mailchimp.png differ
diff --git a/static/img/sponsors/oreilly.png b/static/img/sponsors/oreilly.png
new file mode 100644
index 00000000000..6001b92b73f
Binary files /dev/null and b/static/img/sponsors/oreilly.png differ
diff --git a/static/img/sponsors/pivotal.png b/static/img/sponsors/pivotal.png
new file mode 100644
index 00000000000..e4cb7eb3c71
Binary files /dev/null and b/static/img/sponsors/pivotal.png differ
diff --git a/static/img/sponsors/redislabs.png b/static/img/sponsors/redislabs.png
new file mode 100644
index 00000000000..4cbee316bce
Binary files /dev/null and b/static/img/sponsors/redislabs.png differ
diff --git a/static/img/sponsors/salesforcepardot.png b/static/img/sponsors/salesforcepardot.png
new file mode 100644
index 00000000000..c70c397626b
Binary files /dev/null and b/static/img/sponsors/salesforcepardot.png differ
diff --git a/static/img/sponsors/sumologic.png b/static/img/sponsors/sumologic.png
new file mode 100644
index 00000000000..75cc044cf1b
Binary files /dev/null and b/static/img/sponsors/sumologic.png differ
diff --git a/static/img/sponsors/upguard.png b/static/img/sponsors/upguard.png
new file mode 100644
index 00000000000..7e7ca8e7f22
Binary files /dev/null and b/static/img/sponsors/upguard.png differ
diff --git a/static/img/sponsors/versionone.png b/static/img/sponsors/versionone.png
new file mode 100644
index 00000000000..d43b132aeaa
Binary files /dev/null and b/static/img/sponsors/versionone.png differ
diff --git a/static/img/sponsors/victorops.png b/static/img/sponsors/victorops.png
new file mode 100644
index 00000000000..f17f7002fb6
Binary files /dev/null and b/static/img/sponsors/victorops.png differ