week 2 assignment
merge local and remote master branch