problem solving

i think
breaking things

again
Merge branch 'gh-pages' of https://github.com/sigds2014/web-design into gh-pages

Conflicts:
leslie/css/style.css
leslie/index.html
wut
Just working things out