fixes from lecture 1
merge
merge
added DS_Store to gitignore