redoing dotdom website
Merge branch 'master' of https://github.com/mariannedo/dot-com-assemble

merging nothing