more debugging
Merge branch 'master' of github.com:t2munika/cs454

Conflicts:
	assign3/messages.cpp
even more debugging
final debug (?)
Merge branch 'master' of github.com:t2munika/cs454

Conflicts:
	assign3/binder.c
more changes