Merge branch 'master' of https://github.com/JolandaKossakowski/NetworkApp

Conflicts:
.RData
.Rhistory
Merge branch 'master' of https://github.com/JolandaKossakowski/NetworkApp

Conflicts:
	.RData
	.Rhistory