my newest kids and adults have different wait times
Merge branch 'master' of github.com:maguerosinclair/theme-park-project

Conflicts:
	Customer.java