diff --git a/Berlin-Ville-cmyk.jpg b/Berlin-Ville-cmyk.jpg
deleted file mode 100644
index fa64529..0000000
Binary files a/Berlin-Ville-cmyk.jpg and /dev/null differ
diff --git a/Berlin-Ville.jpg b/Berlin-Ville.jpg
deleted file mode 100644
index 08554d9..0000000
Binary files a/Berlin-Ville.jpg and /dev/null differ
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..76ecc1d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 JSFest.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/Oakland-cmyk-half.jpg b/Oakland-cmyk-half.jpg
deleted file mode 100644
index fc9966d..0000000
Binary files a/Oakland-cmyk-half.jpg and /dev/null differ
diff --git a/Oakland-cmyk.jpg b/Oakland-cmyk.jpg
deleted file mode 100644
index 9e02341..0000000
Binary files a/Oakland-cmyk.jpg and /dev/null differ
diff --git a/Oakland.jpg b/Oakland.jpg
deleted file mode 100644
index f54a6c2..0000000
Binary files a/Oakland.jpg and /dev/null differ
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6cb2147
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+# [jsfest.com](http://http://jsfest.com/)
+
+This is a website for JSFest.
+
+## Fonts
+[Adelle Sans](https://typekit.com/fonts/adelle-sans) and [FF Meta Serif Web Pro](https://typekit.com/fonts/ff-meta-serif-web-pro) are served through Typekit. For modifications ping [@thefoxis](https://github.com/thefoxis).
+
+## Pictures
+All photos are the property of credited owners, allowed for non-commercial use by [Creative Commons](http://creativecommons.org/).
+
+## Contributors
+
+* [Mikeal Rogers](https://github.com/mikeal)
+* [Karolina Szczur](https://github.com/thefoxis)
+
+## License
+MIT
\ No newline at end of file
diff --git a/San_Francisco-cmyk-half.jpg b/San_Francisco-cmyk-half.jpg
deleted file mode 100644
index 0fa844e..0000000
Binary files a/San_Francisco-cmyk-half.jpg and /dev/null differ
diff --git a/San_Francisco-cmyk.jpg b/San_Francisco-cmyk.jpg
deleted file mode 100644
index aee311e..0000000
Binary files a/San_Francisco-cmyk.jpg and /dev/null differ
diff --git a/San_Francisco.jpg b/San_Francisco.jpg
deleted file mode 100644
index cf6fa85..0000000
Binary files a/San_Francisco.jpg and /dev/null differ
diff --git a/css/main.css b/css/main.css
new file mode 100644
index 0000000..b938378
--- /dev/null
+++ b/css/main.css
@@ -0,0 +1,264 @@
+/*===================================================================
+*
+* JSFest.com
+* Made by the community, for the community
+* Created by @mikeal
+* Designed and coded by @fox
+*
+* ❤︎ ✌︎
+*
+===================================================================*/
+
+html {
+ font-size: 100%;
+}
+
+*, *:after, *:before {
+ box-sizing: border-box;
+}
+
+body {
+ border-top: 10px solid black;
+ font: 500 1.125rem/1.5 "ff-meta-serif-web-pro", Georgia, Times, serif;
+ -webkit-font-smoothing: antialiased;
+ text-rendering: optimizeLegibility;
+ text-align: center;
+}
+
+::-moz-selection {
+ background: #FFEB00;
+}
+
+::selection {
+ background: #FFEB00;
+}
+
+.cf:before,
+.cf:after {
+ content: " ";
+ display: table;
+}
+
+.cf:after {
+ clear: both;
+}
+
+a {
+ color: black;
+ border-bottom: 3px solid #FFEB00;
+ text-decoration: none;
+ outline: none;
+}
+
+a:hover {
+ color: #CAB000;
+ border-color: #CAB000;
+ transition: all .5s ease-in;
+ -webkit-transition: all .5s ease-in;
+}
+
+/*-------------------------------------------------------------------
+*
+* Headings
+*
+-------------------------------------------------------------------*/
+
+h1, h2, h3, h4, h5 {
+ font-family: "adelle-sans", Helvetica, Arial, sans-serif;
+ font-weight: 800;
+}
+
+h1 {
+ position: absolute;
+ top: 0;
+ margin-top: 0;
+ font-size: 4rem;
+}
+
+h1 span {
+ display: inline-block;
+ margin-right: .5rem;
+ padding: 1.5rem 1rem 0 1rem;
+ background-color: #FFEB00;
+}
+
+h2 {
+ font-size: 2rem;
+ line-height: 1.2;
+}
+
+h3 {
+ font-size: 1.5rem;
+}
+
+ul {
+ padding: 0;
+ list-style: none;
+}
+
+.lead {
+ font-size: 1.75rem;
+ line-height: 1.25;
+}
+
+/*-------------------------------------------------------------------
+*
+* Event
+*
+-------------------------------------------------------------------*/
+
+.event {
+ position: relative;
+ border: 5px solid black;
+ margin-bottom: 1.25rem;
+}
+
+.event h2 {
+ margin-top: 0;
+}
+
+.event p {
+ margin: 0;
+}
+
+.event-description {
+ padding: 1rem;
+ color: white;
+ background-color: black;
+}
+
+.event-description:before {
+ content: '';
+ display: inline-block;
+ height: 100%;
+ vertical-align: middle;
+ margin-right: -0.25em;
+}
+
+.event-description-inner {
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.event-description a {
+ color: white;
+}
+
+.event-past-badge {
+ display: inline-block;
+ margin-bottom: .5rem;
+ padding: .5rem 1rem;
+ background: red;
+ font-size: 1rem;
+ text-transform: uppercase;
+}
+
+.event-past-badge,
+.photo-credit {
+ font-family: "adelle-sans", Helvetica, Arial, sans-serif;
+}
+
+.photo-credit {
+ position: absolute;
+ border: none;
+ color: white;
+ font-size: .8rem;
+ opacity: .8;
+}
+
+/*-------------------------------------------------------------------
+*
+* Footer
+*
+-------------------------------------------------------------------*/
+
+footer {
+ margin: 3rem 0;
+ color: #333;
+}
+
+footer nav li {
+ display: inline-block;
+}
+
+footer nav a {
+ margin: 0 .3125rem;
+}
+
+/*-------------------------------------------------------------------
+*
+* Mobile
+*
+-------------------------------------------------------------------*/
+
+@media screen and (max-width: 768px) {
+
+ .container {
+ padding: 0 2rem;
+ }
+
+ header {
+ margin-top: 9rem;
+ }
+
+ .event img {
+ max-width: 100%;
+ }
+
+ .event-description {
+ margin-top: -.5rem;
+ }
+
+ .photo-credit {
+ top: .25rem;
+ left: .5rem;
+ }
+
+}
+
+/*-------------------------------------------------------------------
+*
+* Desktop
+*
+-------------------------------------------------------------------*/
+
+@media screen and (min-width: 769px) {
+
+ .container {
+ max-width: 750px;
+ margin: 0 auto;
+ }
+
+ header {
+ margin-top: 11rem;
+ }
+
+ .lead {
+ margin-bottom: 4rem;
+ }
+
+ .event {
+ height: 250px;
+ overflow: hidden;
+ }
+
+ .event img,
+ .event-description {
+ float: left;
+ }
+
+ .event img {
+ width: 60%;
+ }
+
+ .event-description {
+ width: 40%;
+ height: 100%;
+ }
+
+ .photo-credit {
+ bottom: .25rem;
+ left: .5rem;
+ }
+
+}
\ No newline at end of file
diff --git a/css/normalize.min.css b/css/normalize.min.css
new file mode 100644
index 0000000..be9fde3
--- /dev/null
+++ b/css/normalize.min.css
@@ -0,0 +1 @@
+/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
\ No newline at end of file
diff --git a/favicon.png b/favicon.png
index 5297018..3f02b71 100644
Binary files a/favicon.png and b/favicon.png differ
diff --git a/img/berlin.jpg b/img/berlin.jpg
new file mode 100644
index 0000000..00684c5
Binary files /dev/null and b/img/berlin.jpg differ
diff --git a/img/oakland.jpg b/img/oakland.jpg
new file mode 100644
index 0000000..396ed61
Binary files /dev/null and b/img/oakland.jpg differ
diff --git a/img/sf.jpg b/img/sf.jpg
new file mode 100644
index 0000000..67712eb
Binary files /dev/null and b/img/sf.jpg differ
diff --git a/index.html b/index.html
index 7972dba..4d1cb9e 100644
--- a/index.html
+++ b/index.html
@@ -2,106 +2,93 @@
- JSFest
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+ JSFest - A celebration of JavaScript. One city at a time.
+
+
+
+
+
+
+
+
+
- 
+ Photo by Luke Ma
+ 
+ Photo by Decaseconds
+ 
+ Photo by David Yu
+