Devoir 2

Updated even more stuff