Added ability to save canvas as PNG
Fixed conflicts