merge
merge conflict
added icons for linkedin and github
added README