Things I've changed in the CSS 12/12-/12/14
Merge branch 'master' of https://github.com/ammckenzie/news-app-app

Conflicts:
	news-app/platforms/ios/www/css/style.css
	news-app/platforms/ios/www/feeds.html
	rsstest.php