Changes Mac
Data mac
Merge branch 'master' of https://github.com/bigbaier/EnfoLab

Conflicts:
	.RData