Add pin style cards
Merge branch 'master' of github.com:liquidtrends/socialhack

Conflicts:
	public/js/script.js
	public/templates/feed.html