Commit 01/29
Commit 1/29
Merge branch 'master' of https://github.com/cchatterjee3/Modeling

Conflicts:
	Chandim-Project/ModelingPeachtree.dev
	Chandim-Project/ModelingPeachtree.layout
	Chandim-Project/TrafficLight.h
	Chandim-Project/main.cpp
Some linker error, calling it a night 01/29
Merge branch 'master' of https://github.com/cchatterjee3/Modeling