anton changed pixels to 400
Merge branch 'latest_news' of https://github.com/wadetheriver/explore_california into antons_latest_news

Conflicts:
	assets/stylesheets/main.css