Wrote a paragraph for the intro. Here comes the merge conflict
Merge branch 'master' of github.com:hockeybuggy/cis4110paper