function to read XML file from Open Stockholm to data frame
solved merge conflict in .gitignore

Merge branch 'master' of https://github.com/Nektar-io/projectX

Conflicts:
	.gitignore
	projectX.Rproj