This is the second part of my week four assignment
This is second part of week 4
Merge branch 'master' of github.com:sanjae/Prog270-Edin

Conflicts:
	Week04-Git/README.md