commiting strange, arbitrary meta files
fixed ship torque
Merge remote-tracking branch 'origin/master'