pydevproject
Merge branch 'master' of
https://apfejes@github.com/apfejes/epigenetics-software.git

Conflicts:
	Epigenetics/.pydevproject