File cleanup. More system.
Merge branch 'master' of github.com:joy4luck/meng-thesis

Conflicts:
	.gitignore
	thesis.pdf