Modified demo.tex and added conclusion.tex
Merge branch 'dissertation' of github.com:Dan-McElroy/Team-Project--Q into dissertation