Apologies for the poor naming conventions
no message
no message
Merge branch 'problems/6'
Merge branch 'problems/7'
Cleaned up code output slightly, added a comment explaining the math trick