Git practice
solved merge conflict
Added Lab 2 solution.