fixing overrided commits
plant overrided
removed copies
Merge branch 'master' of https://github.com/FinalSpark/CS343Final

Conflicts:
	a6/q1classes.h
	a6/q1plant.cc
	a6/q1printer.cc
	a6/q1student.cc
compilable code