a
Merge branch 'master' of https://github.com/cchatterjee3/Modeling

Conflicts:
	Chandim-Project/Modeling.exe
	Chandim-Project/Modeling.layout
Before meeting
Merge branch 'master' of https://github.com/cchatterjee3/Modeling
Begin meeting
Merge branch 'master' of https://github.com/cchatterjee3/Modeling