Beamer
Merge branch 'master' of github.com:alu0100759389/grupo2I

Conflicts:
	.DS_Store
	src/.DS_Store