fjksla;
Merge branch 'master' of https://github.com/Evidlo/engr132

Conflicts:
	NanoPlane_ewidlosk.m