testing
Merge branch 'master' of https://github.com/MehrnooshSadrzadeh/GenQuant-EASY

Conflicts:
	newfile