Orphans fixed
Merge branch 'master' of https://github.com/nswalton/cosc301_proj05

Conflicts:
	scandisk.c
Newest as of now