Fix merge

fixed the merge
Merge branch 'master' of https://github.com/Nican/cs4732-roller-coaster