Some skeleton code for part 4
Merge branch 'master' of github.com:michaeltingley/CS175

Conflicts:
	Assignment2/asst2.cpp
Updated skeleton code