FIX: wording in the README
Merge pull request #38 from jshao100/master

FIX: wording in the README
fixes #5
Merge branch 'master' of https://github.com/PsychicNoodles/theme-park-project
fixes #9 prints "resizing" to syserr
Merge pull request #42 from PsychicNoodles/master

Sets RiderStatus to FREE for customers that get off a ride
fixes #42 checks to make sure Customer is not null
Merge pull request #44 from PsychicNoodles/master

fixes #42 checks to make sure Customer is not null
fixes #45, added constructor with options for customer count, ride count, and simulation duration
merging with upstream
fixed merge conflicts
Merge pull request #51 from PsychicNoodles/master

fixes #45, added constructor with options for customer count, ride count, and simulation duration
added weather_cust function
Merge branch 'master' of github.com:maguerosinclair/theme-park-project

Conflicts:
	Park.java