test
Merge branch 'master' of https://github.com/SvenAG/SNLP-Final-Project
Merge branch 'master' of https://github.com/SvenAG/SNLP-Final-Project

Conflicts:
	evergreen_without_raw_data.py
Merge branch 'master' of https://github.com/SvenAG/SNLP-Final-Project