small formatting change and update to assignment instructions
Merge pull request #6 from PsychicNoodles/master

Fixes #3 updated so variables are passed in constructor and tick() instead of Park instance
update readme.md to include upstream instructions.
Oliver Freiberg, edited instructions
Merge branch 'master' of git://github.com/cforster/theme-park-project

Conflicts:
	README.md
Merge pull request #26 from JuliusClaudius/master

Instructions Edit
makes appeal a function of riders and ridelength
Merge branch 'master' of git://github.com/maguerosinclair/theme-park-project into maguerosinclair-master
Merge branch 'master' of github.com:cforster/theme-park-project

Conflicts:
	Park.java
FIX: wording in the README
Merge pull request #38 from jshao100/master

FIX: wording in the README
Merge pull request #42 from PsychicNoodles/master

Sets RiderStatus to FREE for customers that get off a ride
Merge pull request #44 from PsychicNoodles/master

fixes #42 checks to make sure Customer is not null
merging with upstream