add local version of tidy script
fix merge conflict

Merge branch 'master' of https://github.com/JonMinton/AQMEN_Data_Vis_Workshop

Conflicts:
	data/contributed/konrad/tidy_the_data_2.r