first commit
Merge https://github.com/dmwoznic/programmingassignment2