contents map
updated contents map to new format
includes an is control column
changing meltdown for the new contents map
new content map for hev
new contentsmap is read in now
Merge branch 'generalising' of https://github.com/C3-CSIRO/Meltdown into generalising

Conflicts:
	error_log.txt
	meltdown.py
resolved conflict
changes to contents maps fixes

stopped adding controls to contents.name
controls work like they did before with the new map
salt multiplicity

can now handle different number of salts for each condition
ignore
control check now checks if control  is present
updated legend
controls are gotten from the contents map now
controls are now checked from the contents map too
made name and ph a key
Merge branch 'generalising' of https://github.com/C3-CSIRO/Meltdown into generalising

Conflicts:
	meltdown.py
gitignore update
Merge branch 'generalising' of https://github.com/C3-CSIRO/Meltdown into generalising