updated readme
updated readme
updates to font-awesome and zocial libraries
merge conflict