5/10 - working at home, getting new copy
Merge branch 'master' of https://github.com/vannawong/green.git

Conflicts:
	Pollution Solution Working v 1/Pollution Solution/Pollution Solution.sdf
	Pollution Solution Working v 1/Pollution Solution/Pollution Solution.v11.suo
	Pollution Solution Working v 1/Pollution Solution/SimpleSideScrollerFramework/src/sssf/gsm/ai/bots/GarbageMon.cpp
	Pollution Solution/Pollution Solution.sdf
Updating from last commit.
Signed-off-by: unknown <vannawong11@gmail.com>
Getting ready to revert.

Signed-off-by: unknown <vannawong11@gmail.com>