Had some mistakes on last commit. Fixed them now.
Merge https://github.com/appcell/OSLab0

Conflicts:
	OSLab0