a
Merge branch 'master' of https://github.com/mcinnamon1/VarunandMollyProject

Conflicts:
	Body.html
ColorInfo
Merge branch 'master' of https://github.com/mcinnamon1/VarunandMollyProject

Conflicts:
	Color.html