Merge branch 'more-stylings' into carmody
Merge branch 'carmody' of https://github.com/mcarmody/GalleryEighteen into carmody