Update error from presentation
Merge branch 'master' of https://github.com/Akinlabiajelabi/energy_disaggregation

Conflicts:
	energy_disaggregation.Rpres