Code fully completed, documentaion left
Merge branch 'master' of github.com:OMMatte/popup-lab3