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

Conflicts:
	.gitignore
	homework/.DS_Store
	homework/eangeles/.DS_Store
lab2
Merge branch 'master' of https://github.com/johncabibbo/dbs

Conflicts:
	homework/.DS_Store