nothing
Merge branch 'master' of https://github.com/faulconbridge/semsat

Conflicts:
	SemSat1/Compile Data/semsatImport.php
	SemSat1/semsat1.r
	SemSat3/Compile Data/semsatImport.php
	SemSat3/RAW/semsat2 44.txt
	SemSat3/RAW/semsat2 45.txt
	SemSat3/RAW/semsat2 46.txt
	SemSat3/RAW/semsat2 47.txt
	SemSat3/RAW/semsat2 48.txt
	SemSat3/RAW/semsat2 49.txt
	SemSat3/RAW/semsat2 50.txt
	SemSat3/RAW/semsat2 51.txt
	SemSat3/RAW/semsat2 52.txt
	SemSat3/RAW/semsat2 53.txt
	SemSat3/RAW/semsat2 54.txt
	SemSat3/RAW/semsat2 55.txt
	SemSat3/RAW/semsat2 56.txt
	SemSat3/RAW/semsat2 57.txt
	SemSat3/RAW/semsat2 59.txt
	SemSat3/RAW/semsat2 60.txt
	SemSat3/RAW/semsat2 61.txt
	SemSat3/RAW/semsat2 62.txt
	SemSat3/RAW/semsat2 63.txt
	SemSat3/semsat3.r
	SemSat3/semsat3_data_compiled.csv
	SemSat3/semsat3_data_compiled.xlsx