changed color to orange
trying to commit color change

Merge branch 'master' of https://github.com/jkcinelli/UW-Rroom

Conflicts:
	src/toyline.R
changed color to purple
clearing

Merge branch 'master' of https://github.com/jkcinelli/UW-Rroom

Conflicts:
	src/toyline.R