Push and pull
Merge branch 'master' of https://github.com/angieboks/PaF-Assignment-2