Conflicts: app/views/project/list.jade public/coffee/list.coffee public/stylesheets/less/list.less public/stylesheets/less/style.less