fixed local conflicts
added css causing tei lb tags to create newline, made codesniffer compliant