OldRose Color

changed to solid png background
Merge branch 'master' of https://github.com/NathanTheGr8/TriangleServer

Conflicts:
	.idea/workspace.xml