trying to discard changes
Merge branch 'master' of https://github.com/pbiecek/archivist

Conflicts:
	DESCRIPTION
	old/R/archiveDataFromObj.R
	old/R/extractTags.R