some changes in data..?
conflict solved

Merge branch 'master' of github.com:muuankarski/QogCorrEastE

Conflicts:
	.gitignore