added GrenisFile on master as well
Left the conflict delimiter thingies intact just for the sake of it

Merge branch 'grenis'

Conflicts:
	GrenisFile.txt
changed readme
Merge branch 'master' into grenis

Conflicts:
	README.md