merge prac2
Merge branch 'master' of https://github.com/teharris/M2

Conflicts:
	readme.p1.txt

merge fix
Merge branch 'master' of https://github.com/watty14/M2