Merge remote-tracking branch 'origin/NicksChanges' into Barend_Branch
fixed typos
fixed typos
Merge remote-tracking branch 'origin/NicksChanges' into Barend_Branch

Conflicts:
	CSE335_Proj04/CSE335_Proj04.xcodeproj/project.pbxproj
started parser
Merge remote-tracking branch 'origin/Barend_Branch' into NicksChanges
finished (need to fix input loop)