minor updates
resolved merge conflicts
minor updates
merge conflict
prepping for gh-pages
updating site metadata