Upload data for Caroline and Vij
Merge branch 'master' of https://github.com/vijakshay/Travel-Diary

Conflicts:
	Code/mergeData.py