semicolons
experiment with better parsing
patch grep to return match, add trailing text to record actual messages
mostly adding semicolons
fix bug with capital letters, resolve conflicts
merge gordon's branch
add subtitles
Merge branch 'jlongster-master'

Conflicts:
	assets/contacts.json
	index.css
	index.js