Add soundeffects for train (3 single steps, not yet optimized though) and horn
Fix merge conflicts