Changing the master branch
resolve merge conflit
added notes completed coding