print out
Merge branch 'master' of github.com:michaeltingley/CS175

Conflicts:
	Assignment4/asst.cpp