dfsdfsdfsdfsdfsdf
ereeee
Merge branch 'master' of
https://github.com/Zarmakuizz/articleanalysis.git

Conflicts:
	src/model/resource.py