Merge branch 'master' of https://github.com/pteridin/MIDASwrappeR

# Conflicts:
#	.Rbuildignore
#	.gitignore