#MIDPS ###Profile Info:
- student: Doloscan Liviu
- grupa: TI-141 F/R
###Folders:
- lab_2: git cli
- lab_3: GUI calculator (python)
- lab_4: website (HTML5, css, js, PHP)
- lab_5: Game Flappy bird (Unity3d)
resolve conflict
another branch(to resolve conflict)