syncing with current github
syncing
Merge branch 'master' of https://github.com/snoogans235/thesis

Conflicts:
	Thesis.pdf
	Thesis.tex