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

Conflicts:
	homework/.DS_Store
	homework/eangeles/.DS_Store