homework table column order sort fix
remove bootstrap.js.coffee
fix merge conflict