oops
Merge branch 'master' of github.com:cdrappi/dfs

Conflicts:
	news.csv
added new blank news