fixes
Merge branch 'Test' of https://github.com/ZackAlfakir/612-2014-advanced into Test

Conflicts:
	PPC603gnu/612-2014-advanced/Debug/612-2014-advanced.out