more work on Project 3
Merge branch 'master' of https://github.com/anthonyjruffa/wpics3013