Completed soap for lunch
Merge branch 'master' of https://github.com/cbaconneumont/bacon_chris_csc360

Conflicts:
	ws_lunch/src/edu/neumont/csc380/model/Lunch.java