Finished whole system, start debugging
Resolved some conflicts
Merge branch 'master' of https://github.com/nashn/ics53project1

Conflicts:
	FileSystem53.cpp
	UISystem53.cpp