small changes to gasCollector and Builder
Merge branch 'master' of https://github.com/jkim91/SC2_OOP

Conflicts:
	SC2_OOP/Builder.h
	SC2_OOP/GasCollector.cpp