Added project paper .tex file
Fixing conflicts