Assignment 1 + 1.2 - Final revision
Merge branch 'master' of https://github.com/Mithradir/PSP