Merge branch 'master' of C:\Users\MalefDimitris\Documents\Newstopia with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	newstopia/articles/templates/articles/index.html
	newstopia/articles/views.py
	newstopia/db.sqlite3