Merge branch 'master' of https://github.com/RubenV22/case

Conflicts:
	Main.pdf