modified README
Merge remote-tracking branch 'origin/master'
added comments to files
finished merge conflict