Initialisation
Merge https://github.com/sbolduc/INF2015Solo