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

Conflicts:
	CSE335_Proj04/CSE335_Proj04.xcodeproj/project.pbxproj
n
second attempt at creating project
fixed typos
all classes created
fixed typos
Merge remote-tracking branch 'origin/NicksChanges' into Barend_Branch

Conflicts:
	CSE335_Proj04/CSE335_Proj04.xcodeproj/project.pbxproj