package setup
merge with remote

Merge branch 'master' of https://github.com/bquast/ExDecompR

Conflicts:
	.gitignore