my first commit of our project in oop2