updated readme
typo
updated gem version
updates to font-awesome and zocial libraries
merge conflict
updated readme branch versions
updated readme merge test
addressed merge conflict in test