Updated notebooks 1 and 2
Merge branch 'master' of https://github.com/stesol01/prog1

Changes within readme conflicted