info circle
Merge branch 'master' of github.com:GuntLondon/weblebrity-trumps

Conflicts:
	static/_includes/js/templates.js