fixed order links
deleted empty file
fixed links for real this time
fix stray steamboat link
fix merge conflicts
Merge branch 'Adam-branch'