bla
	new file:   error_ana.nb
	new file:   readings.xlsx
	deleted:    ../readings.xlsx
Merge branch 'master' of github.com:HappyEmu/physics-reports

Conflicts:
	exp11/data/readings.xlsx
Merge branch 'master' of github.com:HappyEmu/physics-reports