added bibliography file
fixed merge conflicts
re-added report.text
having some problems producing pdf, possible problem with split equation