Finished assignments
Updated gitignore
merge gitignore