small changes
Merge branch 'Paul' of https://github.com/kevincmorris/Lab1 into Paul
Merge branch 'Paul' of https://github.com/kevincmorris/Lab1 into Nico