r3
Merge branch 'master' of https://github.com/simont-18/Programming-Assignment
Revert b6652ca..6d3e75a

This rolls back to commit b6652ca2ca845da313ce7a9dfe9f6120d705c515.
ignore list