new format
Merge branch 'master' of github.com:bm-i/content-test

Conflicts:
	curated/visually-striking/1_2.jpg
	curated/visually-striking/rollercoaster.jsonp