image
Merge branch 'master' of https://github.com/DimitriF/Shiny-HPTLC

Conflicts:
	data/IMG_1222.JPG
	data/batch.xlsx