Added weather hourly details.
Added news articles to city.
Merge branch 'master' of https://github.com/ajhurliman/weatherApp

Conflicts:
	app/js/controllers/cityCtrl.js
	app/partials/city.html