merging
Merge branch 'gh-pages' of https://github.com/camilamercado/site into gh-pages
please do this

merge

megrhe

i
instert bastard

ZZ

i
Z
new templating
Merge branch 'gh-pages' of https://github.com/camilamercado/site into gh-pages
merge fix
add untracked
switch out untracked files
add css imgs
fuss with template sizing