Stuff
Added stupid comment
Added TestNg Test for color conversion
Added TestNg for color conversion
Changed nothing, testing
assigned width and height
Assigned values to w and h
added comment for display
added comment for display
added new function for display
Merged change and resolved conflicts
fixed little files
trying to finish the merge
Added TestNg for color conversion

Conflicts:
	nbproject/private/private.xml
assigned width and height