some unimportant changes
there was a conflict between Connie's changes and my local changes

Conflicts:
	Cell.hpp
Added support for tracking number of flags remaining.