created maping file
added mapping file
fixed mergeMerge branch 'master' of github.com:rachelboy/NHSDataScience

Conflicts:
	config.py