added bib file and started reorienting presentation a bit; removed bib thing from gitignore (shouldn't be there)
resolved conflicts from merge; now have cameron's contributions.