Updated notes
Merge branch 'master' into p7

pulled down changes to Makefile.in
updated some notes
Sieve for problem 7