added commentary that marion is pure coolness
Merge master into marion