Script Detection

Wrap <pre> around script
Wrap with <pre>

Wrap script with <pre> tag
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/chat.js