Merge branch 'master' of https://github.com/radcircle-dev/featured

Conflicts:
	featured.html
feat

feat