Added newest version of the paper

Added the version with Michael's wildcard stuff
Added our edits from today
Worked on the conclusion