All 4 colors added
Debugged color-change issues, HTML form updated
base draw function to draw on-load
Merge branch 'cup_colors'

Conflicts:
	.DS_Store