Example Change
Example Commit
Added nav bar, content, and section titles
Added cards/notes, joint investigation page
Headlines edited
Time for keyframe appearances changed
Video added, boxes moved, timining changed
Merge branch 'linda'
new map
Merge remote-tracking branch 'upstream/master'

Conflicts:
	groups/4/index.html
merge fixes
For Linda
commit
merge
index
For Linda
http to jquery
page add links
got rid of image
Added content: names and bios