minor edits
fixed merge conflict
began styling for posters index
conflicts resolved