misc
Merge branch 'master' of github.com:jrnold/CDB13

Conflicts:
	create_data.R
	source/R/cdb13.R
	source/data/CDB90/CDB90.tsv
	source/data/M000121/CDB90001.WKS
	source/data/M000121/CDB90075.WKS
	source/data/M000121/CDB90150.WKS
	source/data/M000121/CDB90225.WKS
	source/data/M000121/CDB90300.WKS
	source/data/M000121/CDB90375.WKS
	source/data/M000121/CDB90450.WKS
	source/data/M000121/CDB90525.WKS
	source/data/M000121/CDB90600.WKS
	source/data/M000121/CDB90DEF.WKS
	source/data/M000121/README.TXT
	source/data/local/cdb90_to_cow.csv
	source/data/local/duplicates.csv
	source/data/local/misc.csv
	source/data/local/war2.csv
	src-data/CDB90/CDB90.tsv
	src-data/M000121/CDB90001.WKS
	src-data/M000121/CDB90075.WKS
	src-data/M000121/CDB90150.WKS
	src-data/M000121/CDB90225.WKS
	src-data/M000121/CDB90300.WKS
	src-data/M000121/CDB90375.WKS
	src-data/M000121/CDB90450.WKS
	src-data/M000121/CDB90525.WKS
	src-data/M000121/CDB90600.WKS
	src-data/M000121/CDB90DEF.WKS
	src-data/M000121/README.TXT
	src-data/local/cdb90_to_cow.csv
	src-data/local/duplicates.csv
	src-data/local/misc.csv
	src-data/local/war2.csv
	src/cdb13.R
	src/data/CDB90/CDB90.tsv
	src/data/M000121/CDB90001.WKS
	src/data/M000121/CDB90075.WKS
	src/data/M000121/CDB90150.WKS
	src/data/M000121/CDB90225.WKS
	src/data/M000121/CDB90300.WKS
	src/data/M000121/CDB90375.WKS
	src/data/M000121/CDB90450.WKS
	src/data/M000121/CDB90525.WKS
	src/data/M000121/CDB90600.WKS
	src/data/M000121/CDB90DEF.WKS
	src/data/M000121/README.TXT
	src/data/local/cdb90_to_cow.csv
	src/data/local/duplicates.csv
	src/data/local/misc.csv
	src/data/local/war2.csv
	src/data/variable_levels.json
	src/misc.py
	src/model.py