Added a bunch of exercises from work mac
fixed conflicts of merging files from personal and work macs