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