weiss acuch nicht
Merge branch 'master' of https://github.com/christophsax/retropol

Conflicts:
	.gitignore
	retropol.Rproj