lab3
Merge branch 'master' of https://github.com/johncabibbo/dbs

Conflicts:
	.DS_Store
	homework/hlacerda/.DS_Store
	homework/hlacerda/Lab_2/.DS_Store
Merge branch 'master' of https://github.com/johncabibbo/dbs

Conflicts:
	.DS_Store
	homework/hlacerda/.DS_Store
	homework/hlacerda/Lab_2/.DS_Store