Merge branch 'master' of https://github.com/Gbps/rollrcoastr

Conflicts:
	rollrcoastr_coastertest/coasterLib.lua
	rollrcoastr_coastertest/main.lua
Merge branch 'master' of https://github.com/Gbps/rollrcoastr