committing this after a while
commiting my changes
fixing mergeMerge branch 'master' of github.com:rachelboy/NHSDataScience

Conflicts:
	config.py
	nsaid_pipeline.py