What happened?
Merge branch 'master' of github.com:bebopsan/SEC-Thesis

Conflicts:
	.gitignore
	src/Results.tex
Merge branch 'master' of github.com:bebopsan/SEC-Thesis

Conflicts:
	src/Results.tex
	thesis_references.bib