simpler for loop
rename request to order

Conflicts:
	src/main/scala/net/addictivesoftware/starbucks/Starbucks.scala