#1 Init project. Chapter5: 5.1-5.2
-2- fix conflicts