did nothing
fixed incorrect code in embedly method of link model

Merge branch 'master' of https://github.com/toppy42/partnerproject_site

Conflicts:
	linkshare/app/models/link.rb